diff --git a/apps/base/forte-drop-mcp/forte-drop-mcp.yaml b/apps/overlays/upc-dev/forte-drop-mcp/forte-drop-mcp.yaml
similarity index 100%
rename from apps/base/forte-drop-mcp/forte-drop-mcp.yaml
rename to apps/overlays/upc-dev/forte-drop-mcp/forte-drop-mcp.yaml
diff --git a/apps/base/forte-drop-mcp/kustomization.yaml b/apps/overlays/upc-dev/forte-drop-mcp/kustomization.yaml
similarity index 100%
rename from apps/base/forte-drop-mcp/kustomization.yaml
rename to apps/overlays/upc-dev/forte-drop-mcp/kustomization.yaml
diff --git a/apps/base/forte-drop-postgresql/RESTORE.md b/apps/overlays/upc-dev/forte-drop-postgresql/RESTORE.md
similarity index 100%
rename from apps/base/forte-drop-postgresql/RESTORE.md
rename to apps/overlays/upc-dev/forte-drop-postgresql/RESTORE.md
diff --git a/apps/base/forte-drop-postgresql/forte-drop-postgresql.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/forte-drop-postgresql.yaml
similarity index 93%
rename from apps/base/forte-drop-postgresql/forte-drop-postgresql.yaml
rename to apps/overlays/upc-dev/forte-drop-postgresql/forte-drop-postgresql.yaml
index 313fc0c..309639b 100644
--- a/apps/base/forte-drop-postgresql/forte-drop-postgresql.yaml
+++ b/apps/overlays/upc-dev/forte-drop-postgresql/forte-drop-postgresql.yaml
@@ -17,7 +17,7 @@ spec:
   source:
     repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
     targetRevision: HEAD
-    path: apps/base/forte-drop-postgresql/resources
+    path: apps/overlays/upc-dev/forte-drop-postgresql/resources
 
   destination:
     server: https://kubernetes.default.svc
diff --git a/apps/base/forte-drop-postgresql/kustomization.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/kustomization.yaml
similarity index 100%
rename from apps/base/forte-drop-postgresql/kustomization.yaml
rename to apps/overlays/upc-dev/forte-drop-postgresql/kustomization.yaml
diff --git a/apps/base/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml
similarity index 100%
rename from apps/base/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml
rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/forte-drop-pg-creds-sealed.yaml
diff --git a/apps/base/forte-drop-postgresql/resources/kustomization.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/kustomization.yaml
similarity index 100%
rename from apps/base/forte-drop-postgresql/resources/kustomization.yaml
rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/kustomization.yaml
diff --git a/apps/base/forte-drop-postgresql/resources/pg-backup-cronjob.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/pg-backup-cronjob.yaml
similarity index 100%
rename from apps/base/forte-drop-postgresql/resources/pg-backup-cronjob.yaml
rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/pg-backup-cronjob.yaml
diff --git a/apps/base/forte-drop-postgresql/resources/postgresql.yaml b/apps/overlays/upc-dev/forte-drop-postgresql/resources/postgresql.yaml
similarity index 100%
rename from apps/base/forte-drop-postgresql/resources/postgresql.yaml
rename to apps/overlays/upc-dev/forte-drop-postgresql/resources/postgresql.yaml
diff --git a/apps/base/forte-drop/forte-drop-pdb.yaml b/apps/overlays/upc-dev/forte-drop/forte-drop-pdb.yaml
similarity index 100%
rename from apps/base/forte-drop/forte-drop-pdb.yaml
rename to apps/overlays/upc-dev/forte-drop/forte-drop-pdb.yaml
diff --git a/apps/base/forte-drop/forte-drop-secrets-sealed.yaml b/apps/overlays/upc-dev/forte-drop/forte-drop-secrets-sealed.yaml
similarity index 100%
rename from apps/base/forte-drop/forte-drop-secrets-sealed.yaml
rename to apps/overlays/upc-dev/forte-drop/forte-drop-secrets-sealed.yaml
diff --git a/apps/base/forte-drop/forte-drop.yaml b/apps/overlays/upc-dev/forte-drop/forte-drop.yaml
similarity index 100%
rename from apps/base/forte-drop/forte-drop.yaml
rename to apps/overlays/upc-dev/forte-drop/forte-drop.yaml
diff --git a/apps/base/forte-drop/keycloak-client-forte-drop.yaml b/apps/overlays/upc-dev/forte-drop/keycloak-client-forte-drop.yaml
similarity index 100%
rename from apps/base/forte-drop/keycloak-client-forte-drop.yaml
rename to apps/overlays/upc-dev/forte-drop/keycloak-client-forte-drop.yaml
diff --git a/apps/base/forte-drop/kustomization.yaml b/apps/overlays/upc-dev/forte-drop/kustomization.yaml
similarity index 100%
rename from apps/base/forte-drop/kustomization.yaml
rename to apps/overlays/upc-dev/forte-drop/kustomization.yaml
diff --git a/apps/base/forte-drop/namespace.yaml b/apps/overlays/upc-dev/forte-drop/namespace.yaml
similarity index 100%
rename from apps/base/forte-drop/namespace.yaml
rename to apps/overlays/upc-dev/forte-drop/namespace.yaml
diff --git a/apps/overlays/upc-dev/kustomization.yaml b/apps/overlays/upc-dev/kustomization.yaml
index b859fa3..dfc48c3 100644
--- a/apps/overlays/upc-dev/kustomization.yaml
+++ b/apps/overlays/upc-dev/kustomization.yaml
@@ -2,11 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../../base
-- ../../base/forte-drop-postgresql
-- ../../base/forte-drop
-- ../../base/forte-drop-mcp
+- forte-drop-postgresql
+- forte-drop
+- forte-drop-mcp
 
-# No patches needed — base already has "upc-dev" paths
-# upc-dev is the default/base cluster
-# forte-drop and forte-drop-mcp are scoped to upc-dev only — they have
-# hackathon-domain hardcoded values and must not sync to upc-prod.
+# No patches needed — base apps already default to "upc-dev" value paths
+# (upc-dev is the default/base cluster).
+# forte-drop (postgres + web + mcp) and dbunk-demo are upc-dev-only apps — they
+# have hackathon-domain hardcoded values and must not sync to upc-prod, so they
+# live here in the overlay rather than in apps/base/.