diff --git a/kustomize/bases/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml
index 4ff39ff..f4ce48d 100644
--- a/kustomize/bases/nextcloud/kustomization.yaml
+++ b/kustomize/bases/nextcloud/kustomization.yaml
@@ -1,8 +1,6 @@
-bases:
+resources:
   - ../postgres
   - ../redis
-
-resources:
   - nextcloud-deployment.yaml
   - nextcloud-ingress.yaml
 
diff --git a/kustomize/namespaces/gitea/kustomization.yaml b/kustomize/namespaces/gitea/kustomization.yaml
index 1b386a6..e69ae3e 100644
--- a/kustomize/namespaces/gitea/kustomization.yaml
+++ b/kustomize/namespaces/gitea/kustomization.yaml
@@ -1,9 +1,7 @@
-bases:
+resources:
+  - namespace.yaml
   - ../../bases/gitea
   - ../../bases/drone-server
   - ../../bases/drone-runner
 
-resources:
-  - namespace.yaml
-
 namespace: gitea
diff --git a/kustomize/namespaces/kube-system/kustomization.yaml b/kustomize/namespaces/kube-system/kustomization.yaml
index 0527ea0..1dbed0f 100644
--- a/kustomize/namespaces/kube-system/kustomization.yaml
+++ b/kustomize/namespaces/kube-system/kustomization.yaml
@@ -1,4 +1,4 @@
-bases:
+resources:
   - ../../bases/traefik
   - ../../bases/prometheus-operator
 
diff --git a/kustomize/namespaces/kubernetes-dashboard/kustomization.yaml b/kustomize/namespaces/kubernetes-dashboard/kustomization.yaml
index 0f16cfb..9815dce 100644
--- a/kustomize/namespaces/kubernetes-dashboard/kustomization.yaml
+++ b/kustomize/namespaces/kubernetes-dashboard/kustomization.yaml
@@ -1,4 +1,4 @@
-bases:
+resources:
   - ../../bases/kubernetes-dashboard
 
 namespace: kubernetes-dashboard
diff --git a/kustomize/namespaces/monitoring/kustomization.yaml b/kustomize/namespaces/monitoring/kustomization.yaml
index 785c2b4..2d7eb7f 100644
--- a/kustomize/namespaces/monitoring/kustomization.yaml
+++ b/kustomize/namespaces/monitoring/kustomization.yaml
@@ -1,4 +1,5 @@
-bases:
+resources:
+  - namespace.yaml
   - ../../bases/prometheus
   # - ../../bases/node-exporter
   - ../../bases/blackbox-exporter
@@ -14,7 +15,4 @@ bases:
   # - servicemonitors/node-exporter.yaml
   - probes/blackbox-exporter.yaml
 
-resources:
-  - namespace.yaml
-
 namespace: monitoring
diff --git a/kustomize/namespaces/nextcloud/kustomization.yaml b/kustomize/namespaces/nextcloud/kustomization.yaml
index 60ca2f2..e7f6622 100644
--- a/kustomize/namespaces/nextcloud/kustomization.yaml
+++ b/kustomize/namespaces/nextcloud/kustomization.yaml
@@ -1,7 +1,5 @@
-bases:
-  - ../../bases/nextcloud
-
 resources:
   - namespace.yaml
+  - ../../bases/nextcloud
 
 namespace: nextcloud
diff --git a/kustomize/overlays/prod-cluster/kustomization.yaml b/kustomize/overlays/prod-cluster/kustomization.yaml
index 555e3ab..e27ca91 100644
--- a/kustomize/overlays/prod-cluster/kustomization.yaml
+++ b/kustomize/overlays/prod-cluster/kustomization.yaml
@@ -1,8 +1,11 @@
-bases:
+resources:
   - ../../namespaces/kube-system
   - ../../bases/longhorn
 
-# allow "kubectl apply -l app.kubernetes.io/managed-by=cluster --prune ..."
+buildMetadata:
+  - originAnnotations
+  - transformerAnnotations
+
 commonLabels:
   app.kubernetes.io/managed-by: kustomize-cluster
 
@@ -10,6 +13,13 @@ transformers:
   - transformers/placeholders.yaml
   - transformers/ssm-secrets.yaml
 
+configMapGenerator:
+  - name: cluster-replacements
+    namespace: default
+    literals:
+      - TRAEFIK_EXTERNAL_HOST=traefik.badjnet.home
+      - LONGHORN_EXTERNAL_HOST=longhorn.badjnet.home
+
 secretGenerator:
   - name: s3-backupstore-credentials
     type: Opaque
diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml
index 22a6955..e06c32a 100644
--- a/kustomize/overlays/prod/kustomization.yaml
+++ b/kustomize/overlays/prod/kustomization.yaml
@@ -7,6 +7,10 @@ resources:
 # resources:
 #   - probes/external-services-bobcat-miner.yaml
 
+buildMetadata:
+  - originAnnotations
+  - transformerAnnotations
+
 images:
   - name: gitea/gitea
     newTag: 1.16.9