diff --git a/.gitignore b/.gitignore
index b12730e..4c1b874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_STORE
 Chart.lock
+charts/
 .claude
\ No newline at end of file
diff --git a/cockroach/versions/1.4.0/templates/workload-backup.yaml b/cockroach/versions/1.4.0/templates/workload-backup.yaml
index ed18e4f..2c9d2d5 100644
--- a/cockroach/versions/1.4.0/templates/workload-backup.yaml
+++ b/cockroach/versions/1.4.0/templates/workload-backup.yaml
@@ -17,7 +17,19 @@ spec:
         - name: BACKUP_PROVIDER
           value: {{ .Values.backup.provider }}
         - name: COCKROACH_HOST
+          {{- if .Values.pgbouncer.enabled }}
+          value: {{ include "cockroach.pgbouncer.name" . }}.{{ .Values.gvc.name }}.cpln.local
+          {{- else }}
           value: {{ include "cockroach.name" . }}.{{ .Values.gvc.name }}.cpln.local
+          {{- end }}
+        - name: COCKROACH_PORT
+          {{- if .Values.pgbouncer.enabled }}
+          value: "5432"
+          {{- else }}
+          value: "26257"
+          {{- end }}
+        - name: COCKROACH_DB
+          value: {{ .Values.database.name | quote }}
       {{- if eq .Values.backup.provider "aws" }}
         - name: AWS_BUCKET
           value: {{ .Values.backup.aws.bucket }}
diff --git a/cockroach/versions/1.4.0/templates/workload-cockroach.yaml b/cockroach/versions/1.4.0/templates/workload-cockroach.yaml
index c26355a..01c2ccc 100644
--- a/cockroach/versions/1.4.0/templates/workload-cockroach.yaml
+++ b/cockroach/versions/1.4.0/templates/workload-cockroach.yaml
@@ -62,6 +62,8 @@ spec:
       target: 100
     capacityAI: false
     debug: false
+    multiZone:
+      enabled: {{ .Values.multiZone }}
     suspend: false
     timeoutSeconds: 10
   firewallConfig:
@@ -95,6 +97,8 @@ spec:
       capacityAI: false
       debug: false
       location: //location/{{ $location.name }}
+      multiZone:
+        enabled: {{ $.Values.multiZone }}
       suspend: {{ if eq ($location.replicas | int) 0 }}true{{ else }}false{{ end }}
       timeoutSeconds: 10
     {{- end }}
diff --git a/cockroach/versions/1.4.0/values.yaml b/cockroach/versions/1.4.0/values.yaml
index 490cbc2..accbbed 100644
--- a/cockroach/versions/1.4.0/values.yaml
+++ b/cockroach/versions/1.4.0/values.yaml
@@ -1,15 +1,17 @@
 gvc:
   name: cockroach-gvc
   locations:
-    - name: aws-us-west-2
-      replicas: 3
-    - name: aws-us-east-2
+    - name: aws-us-east-1
       replicas: 3
     - name: aws-eu-central-1
       replicas: 3
+    - name: aws-us-west-2
+      replicas: 3
 
 image: cockroachdb/cockroach:v25.4.0
 
+multiZone: false
+
 resources:
   cpu: 2
   memory: 4Gi
@@ -57,10 +59,10 @@ pgbouncer:
 
 backup:
   enabled: false
-  image: controlplanecorporation/cockroach-backup:1.0
+  image: ghcr.io/controlplane-com/backup-images/cockroach-backup:1.1
   schedule: "0 2 * * *"
   activeDeadlineSeconds: 14400   # hard kill after 4 hours if backup hangs
-  location: aws-us-east-2        # run the backup job in the same region as your storage bucket
+  location: aws-us-east-1        # run the backup job in the same region as your storage bucket
   resources:
     cpu: 500m
     memory: 512Mi