diff --git a/echo-server/app/helmrelease.yaml b/echo-server/base/helmrelease.yaml
similarity index 100%
rename from echo-server/app/helmrelease.yaml
rename to echo-server/base/helmrelease.yaml
diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml
index 4448636..f293297 100644
--- a/echo-server/ks.yaml
+++ b/echo-server/ks.yaml
@@ -9,7 +9,27 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./echo-server/app
+  path: ./echo-server/base
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: tenant-repos
+  wait: false
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app echo-server-overlays
+  namespace: ${TENANT_NAMESPACE}
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./echo-server/overlays/${TENANT_NAMESPACE}
   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
new file mode 100644
index 0000000..f4ce706
--- /dev/null
+++ b/echo-server/overlays/tenant-tpl-dev/kustomization.yaml
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..20ab7f6
--- /dev/null
+++ b/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000..e6474d2
--- /dev/null
+++ b/echo-server/overlays/tenant-tpl/kustomization.yaml
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..0a35fe1
--- /dev/null
+++ b/echo-server/overlays/tenant-tpl/patch-resources.yaml
@@ -0,0 +1,17 @@
+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