diff --git a/.gitignore b/.gitignore
index 27e0adc..f05baae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-charts/mariadb
-charts/mariadb-*.tgz
-
+base/charts/mariadb
+base/charts/mariadb-*.tgz
diff --git a/charts/antennas-front/Chart.yaml b/base/charts/antennas-front/Chart.yaml
similarity index 100%
rename from charts/antennas-front/Chart.yaml
rename to base/charts/antennas-front/Chart.yaml
diff --git a/charts/antennas-front/templates/_helpers.tpl b/base/charts/antennas-front/templates/_helpers.tpl
similarity index 100%
rename from charts/antennas-front/templates/_helpers.tpl
rename to base/charts/antennas-front/templates/_helpers.tpl
diff --git a/charts/antennas-front/templates/deployment.yaml b/base/charts/antennas-front/templates/deployment.yaml
similarity index 100%
rename from charts/antennas-front/templates/deployment.yaml
rename to base/charts/antennas-front/templates/deployment.yaml
diff --git a/charts/antennas-front/templates/service.yaml b/base/charts/antennas-front/templates/service.yaml
similarity index 100%
rename from charts/antennas-front/templates/service.yaml
rename to base/charts/antennas-front/templates/service.yaml
diff --git a/charts/antennas-front/values.yaml b/base/charts/antennas-front/values.yaml
similarity index 100%
rename from charts/antennas-front/values.yaml
rename to base/charts/antennas-front/values.yaml
diff --git a/charts/antennas-incident/Chart.yaml b/base/charts/antennas-incident/Chart.yaml
similarity index 100%
rename from charts/antennas-incident/Chart.yaml
rename to base/charts/antennas-incident/Chart.yaml
diff --git a/charts/antennas-incident/templates/_helpers.tpl b/base/charts/antennas-incident/templates/_helpers.tpl
similarity index 100%
rename from charts/antennas-incident/templates/_helpers.tpl
rename to base/charts/antennas-incident/templates/_helpers.tpl
diff --git a/charts/antennas-incident/templates/deployment.yaml b/base/charts/antennas-incident/templates/deployment.yaml
similarity index 100%
rename from charts/antennas-incident/templates/deployment.yaml
rename to base/charts/antennas-incident/templates/deployment.yaml
diff --git a/charts/antennas-incident/templates/service.yaml b/base/charts/antennas-incident/templates/service.yaml
similarity index 100%
rename from charts/antennas-incident/templates/service.yaml
rename to base/charts/antennas-incident/templates/service.yaml
diff --git a/charts/antennas-incident/values.yaml b/base/charts/antennas-incident/values.yaml
similarity index 100%
rename from charts/antennas-incident/values.yaml
rename to base/charts/antennas-incident/values.yaml
diff --git a/kustomization.yaml b/base/kustomization.yaml
similarity index 92%
rename from kustomization.yaml
rename to base/kustomization.yaml
index d39cdcc..abd33fa 100644
--- a/kustomization.yaml
+++ b/base/kustomization.yaml
@@ -1,5 +1,3 @@
-namespace: antennas-prod
-
 helmCharts:
 - name: mariadb
   version: 0.1.0
@@ -11,6 +9,8 @@ helmCharts:
       username: "antennas"
       password: "secret"
       rootpassword: "secret"
+    image:
+      tag: latest
 - name: antennas-front
   version: 0.0.1
   releaseName: antennas-front
@@ -18,6 +18,8 @@ helmCharts:
     incident:
       apikey: super-secret
       url: http://antennas-incident:8080
+    image:
+      tag: latest
 - name: antennas-incident
   version: 0.0.1
   releaseName: antennas-incident
@@ -28,6 +30,3 @@ helmCharts:
       dbname: "antennas"
       username: "antennas"
       password: "secret"
-
-resources:
-- route.yaml
diff --git a/prod/kustomization.yaml b/prod/kustomization.yaml
new file mode 100644
index 0000000..1846dd7
--- /dev/null
+++ b/prod/kustomization.yaml
@@ -0,0 +1,5 @@
+bases:
+- ../base
+namespace: antennas-prod
+resources:
+- route.yaml
diff --git a/route.yaml b/prod/route.yaml
similarity index 100%
rename from route.yaml
rename to prod/route.yaml
diff --git a/test/kustomization.yaml b/test/kustomization.yaml
new file mode 100644
index 0000000..9e50d08
--- /dev/null
+++ b/test/kustomization.yaml
@@ -0,0 +1,3 @@
+bases:
+- ../base
+namespace: antennas-test