diff --git a/kustomization/bases/kustomization.yaml b/kustomization/bases/kustomization.yaml
index 7dbceeb..20d048e 100644
--- a/kustomization/bases/kustomization.yaml
+++ b/kustomization/bases/kustomization.yaml
@@ -22,25 +22,6 @@ patches:
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value: {name: CLICKHOUSE_HOST, value: http://clickhouse.databases:8123}
-      - op: add
-        path: /spec/template/spec/containers/0/env/-
-        value: {name: POSTGRES_HOST, value: postgres.databases}
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value: {name: POSTGRES_PORT, value: '5432'}
-  - target:
-      name: nocodelytics-debug
-      kind: Pod
-    patch: |-
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: NATS_URL, value: http://nats.databases}
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: CLICKHOUSE_HOST, value: http://clickhouse.databases:8123}
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: POSTGRES_HOST, value: postgres.databases}
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: POSTGRES_PORT, value: '5432'}
diff --git a/kustomization/bases/nocodelytics-dashboard.yaml b/kustomization/bases/nocodelytics-dashboard.yaml
index c722334..4b6ff56 100644
--- a/kustomization/bases/nocodelytics-dashboard.yaml
+++ b/kustomization/bases/nocodelytics-dashboard.yaml
@@ -69,22 +69,3 @@ spec:
     certResolver: letsencrypt
     domains:
       - main: default.nocodelytics.com
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nocodelytics-debug
-spec:
-  containers:
-    - name: nocodelytics-debug
-      image: container-registry.nocodelytics.com/nocodelytics:latest
-      command: ["/bin/sh"]
-      args: ["-c", "while true; do sleep 30; done;"]
-      env:
-        - name: PORT
-          value: "8080"
-      envFrom:
-        - secretRef:
-            name: secrets
----
-
diff --git a/kustomization/overlays/production/kustomization.yaml b/kustomization/overlays/production/kustomization.yaml
index e52095a..8c8d7b4 100644
--- a/kustomization/overlays/production/kustomization.yaml
+++ b/kustomization/overlays/production/kustomization.yaml
@@ -9,19 +9,6 @@ patches:
     target:
       kind: Namespace
       name: default
-  - target:
-      name: nocodelytics-debug
-      kind: Pod
-    patch: |-
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: NODE_ENV, value: production}
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: CLICKHOUSE_DATABASE, value: nocodelytics_production}
-      - op: add
-        path: /spec/containers/0/env/-
-        value: {name: POSTGRES_DATABASE, value: nocodelytics_production}
   - target:
       group: apps
       version: v1
@@ -33,6 +20,9 @@ patches:
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value: {name: CLICKHOUSE_DATABASE, value: nocodelytics_production}
+      - op: add
+        path: /spec/template/spec/containers/0/env/-
+        value: {name: POSTGRES_HOST, value: pgbouncer.databases}
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value: {name: POSTGRES_DATABASE, value: nocodelytics_production}
diff --git a/kustomization/overlays/staging/kustomization.yaml b/kustomization/overlays/staging/kustomization.yaml
index 388d45e..6784b36 100644
--- a/kustomization/overlays/staging/kustomization.yaml
+++ b/kustomization/overlays/staging/kustomization.yaml
@@ -20,6 +20,9 @@ patches:
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value: {name: CLICKHOUSE_DATABASE, value: nocodelytics_staging}
+      - op: add
+        path: /spec/template/spec/containers/0/env/-
+        value: {name: POSTGRES_HOST, value: postgres.databases}
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value: {name: POSTGRES_DATABASE, value: nocodelytics_staging}