diff --git a/.circleci/ansible/production.hosts b/.circleci/ansible/production.hosts
index 2ed8f517f7..6cefd724d8 100644
--- a/.circleci/ansible/production.hosts
+++ b/.circleci/ansible/production.hosts
@@ -1,5 +1,6 @@
 [pageservers]
-zenith-1-ps-1 console_region_id=1
+#zenith-1-ps-1 console_region_id=1
+zenith-1-ps-2 console_region_id=1
 
 [safekeepers]
 zenith-1-sk-1 console_region_id=1
@@ -15,4 +16,4 @@ console_mgmt_base_url = http://console-release.local
 bucket_name           = zenith-storage-oregon
 bucket_region         = us-west-2
 etcd_endpoints        = etcd-release.local:2379
-safekeeper_enable_s3_offload = true
+safekeeper_enable_s3_offload = false
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41f7693726..5346e35c01 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -685,7 +685,7 @@ jobs:
           name: Setup helm v3
           command: |
             curl -s https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
-            helm repo add zenithdb https://neondatabase.github.io/helm-charts
+            helm repo add neondatabase https://neondatabase.github.io/helm-charts
       - run:
           name: Re-deploy proxy
           command: |
diff --git a/control_plane/src/compute.rs b/control_plane/src/compute.rs
index 92d0e080d8..350cf74b7c 100644
--- a/control_plane/src/compute.rs
+++ b/control_plane/src/compute.rs
@@ -274,6 +274,8 @@ impl PostgresNode {
         conf.append("listen_addresses", &self.address.ip().to_string());
         conf.append("port", &self.address.port().to_string());
         conf.append("wal_keep_size", "0");
+        // walproposer panics when basebackup is invalid, it is pointless to restart in this case.
+        conf.append("restart_after_crash", "off");
 
         // Configure the node to fetch pages from pageserver
         let pageserver_connstr = {
diff --git a/vendor/postgres b/vendor/postgres
index 79af2faf08..038b2b98e5 160000
--- a/vendor/postgres
+++ b/vendor/postgres
@@ -1 +1 @@
-Subproject commit 79af2faf08d9bec1b1664a72936727dcca36d253
+Subproject commit 038b2b98e5c3d6274cbd43e9b822cdd946cb8b91