diff --git a/echo-server/base/helmrelease.yaml b/echo-server/app/helmrelease.yaml
similarity index 100%
rename from echo-server/base/helmrelease.yaml
rename to echo-server/app/helmrelease.yaml
diff --git a/echo-server/base/kustomization.yaml b/echo-server/base/kustomization.yaml
deleted file mode 100644
index 016463c..0000000
--- a/echo-server/base/kustomization.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resources:
-  - helmrelease.yaml
diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml
index d47f94b..4448636 100644
--- a/echo-server/ks.yaml
+++ b/echo-server/ks.yaml
@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./echo-server/overlays/${TENANT_NAMESPACE}
+  path: ./echo-server/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/echo-server/overlays/tenant-tpl-dev/kustomization.yaml b/echo-server/overlays/tenant-tpl-dev/kustomization.yaml
deleted file mode 100644
index f4ce706..0000000
--- a/echo-server/overlays/tenant-tpl-dev/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resources:
-  - ../../base
-
-patchesStrategicMerge:
-  - patch-replicas.yaml
diff --git a/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml b/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml
deleted file mode 100644
index 20ab7f6..0000000
--- a/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: echo-server
-spec:
-  values:
-    controllers:
-      echo-server:
-        replicas: 5  # increase replicas for dev
-
diff --git a/echo-server/overlays/tenant-tpl/kustomization.yaml b/echo-server/overlays/tenant-tpl/kustomization.yaml
deleted file mode 100644
index e6474d2..0000000
--- a/echo-server/overlays/tenant-tpl/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resources:
-  - ../../base
-
-patchesStrategicMerge:
-  - patch-resources.yaml
diff --git a/echo-server/overlays/tenant-tpl/patch-resources.yaml b/echo-server/overlays/tenant-tpl/patch-resources.yaml
deleted file mode 100644
index 0a35fe1..0000000
--- a/echo-server/overlays/tenant-tpl/patch-resources.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: echo-server
-spec:
-  values:
-    controllers:
-      echo-server:
-        containers:
-          app:
-            resources:
-              requests:
-                cpu: 100m
-                memory: 128Mi
-              limits:
-                cpu: 500m
-                memory: 512Mi
diff --git a/vars/tenant-tpl-dev/dev-example.yaml b/vars/tenant-tpl-dev/dev-example.yaml
deleted file mode 100644
index 8b83b7d..0000000
--- a/vars/tenant-tpl-dev/dev-example.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: example-vars-dev
-data:
-  EXAMPLE: foo-dev