diff --git a/BUILD b/BUILD
index 2f429daadff..e58f47c1030 100644
--- a/BUILD
+++ b/BUILD
@@ -7,64 +7,11 @@ gazelle(
     external = "vendored",
 )
 
-load("@k8s_object//:defaults.bzl", "k8s_object")
-
-k8s_object(
-    name = "controller",
-    images = {
-        "bind-controller:latest": "//cmd/controller:image",
-    },
-    template = "controller.yaml",
-)
-
-k8s_object(
-    name = "namespace",
-    template = "namespace.yaml",
-)
-
-k8s_object(
-    name = "serviceaccount",
-    template = "serviceaccount.yaml",
-)
-
-k8s_object(
-    name = "clusterrolebinding",
-    template = "clusterrolebinding.yaml",
-)
-
-k8s_object(
-    name = "bind",
-    template = "bind.yaml",
-)
-
-k8s_object(
-    name = "eventtype",
-    template = "eventtype.yaml",
-)
-
-k8s_object(
-    name = "eventsource",
-    template = "eventsource.yaml",
-)
-
 load("@io_bazel_rules_k8s//k8s:objects.bzl", "k8s_objects")
 
-k8s_objects(
-    name = "authz",
-    objects = [
-        ":serviceaccount",
-        ":clusterrolebinding",
-    ],
-)
-
 k8s_objects(
     name = "everything",
     objects = [
-        ":namespace",
-        ":authz",
-        ":bind",
-        ":eventtype",
-        ":eventsource",
-        ":controller",
+        "//config:everything",
     ],
 )
diff --git a/config/BUILD b/config/BUILD
new file mode 100644
index 00000000000..6ed0e5e188b
--- /dev/null
+++ b/config/BUILD
@@ -0,0 +1,63 @@
+package(default_visibility = ["//visibility:public"])
+
+load("@k8s_object//:defaults.bzl", "k8s_object")
+
+k8s_object(
+    name = "controller",
+    images = {
+        "github.com/elafros/eventing/cmd/controller": "//cmd/controller:image",
+    },
+    template = "controller.yaml",
+)
+
+k8s_object(
+    name = "namespace",
+    template = "a-namespace.yaml",
+)
+
+k8s_object(
+    name = "serviceaccount",
+    template = "serviceaccount.yaml",
+)
+
+k8s_object(
+    name = "clusterrolebinding",
+    template = "clusterrolebinding.yaml",
+)
+
+k8s_object(
+    name = "bind",
+    template = "bind.yaml",
+)
+
+k8s_object(
+    name = "eventtype",
+    template = "eventtype.yaml",
+)
+
+k8s_object(
+    name = "eventsource",
+    template = "eventsource.yaml",
+)
+
+load("@io_bazel_rules_k8s//k8s:objects.bzl", "k8s_objects")
+
+k8s_objects(
+    name = "authz",
+    objects = [
+        ":serviceaccount",
+        ":clusterrolebinding",
+    ],
+)
+
+k8s_objects(
+    name = "everything",
+    objects = [
+        ":namespace",
+        ":authz",
+        ":bind",
+        ":eventtype",
+        ":eventsource",
+        ":controller",
+    ],
+)
diff --git a/namespace.yaml b/config/a-namespace.yaml
similarity index 100%
rename from namespace.yaml
rename to config/a-namespace.yaml
diff --git a/bind.yaml b/config/bind.yaml
similarity index 100%
rename from bind.yaml
rename to config/bind.yaml
diff --git a/clusterrolebinding.yaml b/config/clusterrolebinding.yaml
similarity index 100%
rename from clusterrolebinding.yaml
rename to config/clusterrolebinding.yaml
diff --git a/controller.yaml b/config/controller.yaml
similarity index 94%
rename from controller.yaml
rename to config/controller.yaml
index 82020a8b654..11396956835 100644
--- a/controller.yaml
+++ b/config/controller.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: bind-controller
       containers:
       - name: bind-controller
-        image: bind-controller:latest
+        image: github.com/elafros/eventing/cmd/controller
         args: [
           "-logtostderr",
           "-stderrthreshold", "INFO",
diff --git a/eventsource.yaml b/config/eventsource.yaml
similarity index 100%
rename from eventsource.yaml
rename to config/eventsource.yaml
diff --git a/eventtype.yaml b/config/eventtype.yaml
similarity index 100%
rename from eventtype.yaml
rename to config/eventtype.yaml
diff --git a/serviceaccount.yaml b/config/serviceaccount.yaml
similarity index 100%
rename from serviceaccount.yaml
rename to config/serviceaccount.yaml
diff --git a/sample/github/BUILD b/sample/github/BUILD
index f650161ea76..ee759354293 100644
--- a/sample/github/BUILD
+++ b/sample/github/BUILD
@@ -33,7 +33,7 @@ load("@k8s_object//:defaults.bzl", "k8s_object")
 k8s_object(
     name = "configuration",
     images = {
-        "git-webhook:latest": ":image",
+        "github.com/elafros/eventing/sample/github": ":image",
     },
     template = ":configuration.yaml",
 )
diff --git a/sample/github/configuration.yaml b/sample/github/configuration.yaml
index df4f3a955e3..586edf93dd4 100644
--- a/sample/github/configuration.yaml
+++ b/sample/github/configuration.yaml
@@ -24,7 +24,7 @@ spec:
         elafros.dev/type: container
     spec:
       container:
-        image: git-webhook:latest
+        image: github.com/elafros/eventing/sample/github
         env:
           - name: GITHUB_SECRET
             valueFrom: