diff --git a/helm/acapy-cloud.yaml.gotmpl b/helm/acapy-cloud.yaml.gotmpl
index 21a71a9ad..db3335996 100644
--- a/helm/acapy-cloud.yaml.gotmpl
+++ b/helm/acapy-cloud.yaml.gotmpl
@@ -127,6 +127,7 @@ releases:
         podLabels:
           admission.datadoghq.com/enabled: "false"
           tags.datadoghq.com/env: {{ .Environment.Name }}
+          sidecar.istio.io/inject: "false"
       - nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
         tolerations: {{ toYaml .Values.tolerations | nindent 10 }}
     set:
diff --git a/helm/acapy-cloud/conf/dev/governance-agent.yaml b/helm/acapy-cloud/conf/dev/governance-agent.yaml
index afc5dff76..b3aabea0d 100644
--- a/helm/acapy-cloud/conf/dev/governance-agent.yaml
+++ b/helm/acapy-cloud/conf/dev/governance-agent.yaml
@@ -137,6 +137,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: false
diff --git a/helm/acapy-cloud/conf/dev/mediator.yaml b/helm/acapy-cloud/conf/dev/mediator.yaml
index 2f7808dea..2e5ce9e44 100644
--- a/helm/acapy-cloud/conf/dev/mediator.yaml
+++ b/helm/acapy-cloud/conf/dev/mediator.yaml
@@ -106,6 +106,20 @@ readinessProbe:
 #     memory: 384Mi
 
 initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
   - name: wait-governance-agent
     image: curlimages/curl
     command:
diff --git a/helm/acapy-cloud/conf/dev/multitenant-agent.yaml b/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
index 2d033d7fb..27ee6d997 100644
--- a/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
+++ b/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
@@ -118,6 +118,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: true
diff --git a/helm/acapy-cloud/conf/dev/trust-registry.yaml b/helm/acapy-cloud/conf/dev/trust-registry.yaml
index 763646b78..1ed326d8d 100644
--- a/helm/acapy-cloud/conf/dev/trust-registry.yaml
+++ b/helm/acapy-cloud/conf/dev/trust-registry.yaml
@@ -70,8 +70,13 @@ readinessProbe:
 autoscaling:
   enabled: false
 
+initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z cloudapi-pgpool 5432; do echo waiting for pgproxy; sleep 2; done;']
+
 secretData:
-  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-postgresql:5432/trust-registry?sslmode=prefer
+  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-pgpool:5432/trust-registry?sslmode=prefer
 
 env:
   LOG_LEVEL: warning
diff --git a/helm/acapy-cloud/conf/local/governance-agent.yaml b/helm/acapy-cloud/conf/local/governance-agent.yaml
index 376aeec7c..f5a864f1f 100644
--- a/helm/acapy-cloud/conf/local/governance-agent.yaml
+++ b/helm/acapy-cloud/conf/local/governance-agent.yaml
@@ -137,6 +137,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: false
diff --git a/helm/acapy-cloud/conf/local/mediator.yaml b/helm/acapy-cloud/conf/local/mediator.yaml
index ec87924c9..ea039f705 100644
--- a/helm/acapy-cloud/conf/local/mediator.yaml
+++ b/helm/acapy-cloud/conf/local/mediator.yaml
@@ -106,6 +106,20 @@ readinessProbe:
 #     memory: 384Mi
 
 initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
   - name: wait-governance-agent
     image: curlimages/curl
     command:
diff --git a/helm/acapy-cloud/conf/local/multitenant-agent.yaml b/helm/acapy-cloud/conf/local/multitenant-agent.yaml
index 6714ee5cd..bd72c1663 100644
--- a/helm/acapy-cloud/conf/local/multitenant-agent.yaml
+++ b/helm/acapy-cloud/conf/local/multitenant-agent.yaml
@@ -119,6 +119,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: true
diff --git a/helm/acapy-cloud/conf/local/trust-registry.yaml b/helm/acapy-cloud/conf/local/trust-registry.yaml
index 2fd42446d..35d1c57aa 100644
--- a/helm/acapy-cloud/conf/local/trust-registry.yaml
+++ b/helm/acapy-cloud/conf/local/trust-registry.yaml
@@ -70,8 +70,13 @@ readinessProbe:
 autoscaling:
   enabled: false
 
+initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z cloudapi-pgpool 5432; do echo waiting for pgproxy; sleep 2; done;']
+
 secretData:
-  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-postgresql:5432/trust-registry?sslmode=prefer
+  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-pgpool:5432/trust-registry?sslmode=prefer
 
 env:
   LOG_LEVEL: warning
diff --git a/helm/acapy-cloud/values.yaml b/helm/acapy-cloud/values.yaml
index 9bf5321e1..dc8fdbdf3 100644
--- a/helm/acapy-cloud/values.yaml
+++ b/helm/acapy-cloud/values.yaml
@@ -62,7 +62,7 @@ podLabels:
   admission.datadoghq.com/enabled: "false" # disabled by default (for now)
 podAnnotations:
   # gcr.io/datadoghq/dd-lib-python-init
-  admission.datadoghq.com/python-lib.version: v2.20.0
+  admission.datadoghq.com/python-lib.version: v2.20.1
   ad.datadoghq.com/istio-proxy.logs: '[{ "source": "envoy", "service": "{{ include "acapy-cloud.fullname" . }}" }]'
   ad.datadoghq.com/istio-init.logs: '[{ "source": "envoy", "service": "{{ include "acapy-cloud.fullname" . }}" }]'
 
diff --git a/tilt/acapy-cloud/Tiltfile b/tilt/acapy-cloud/Tiltfile
index 86ae8950b..0b750f22e 100644
--- a/tilt/acapy-cloud/Tiltfile
+++ b/tilt/acapy-cloud/Tiltfile
@@ -125,7 +125,6 @@ def setup_nats(namespace):
         resource_deps=[
             "cloudapi-ns",
             "build-nats",
-            "istio",
         ],
         port_forwards=[
             port_forward(8222, name="monitoring"),