diff --git a/control_plane/src/compute.rs b/control_plane/src/compute.rs
index 282e94aed5..85f6c45ece 100644
--- a/control_plane/src/compute.rs
+++ b/control_plane/src/compute.rs
@@ -287,6 +287,7 @@ impl PostgresNode {
         conf.append("max_replication_slots", "10");
         conf.append("hot_standby", "on");
         conf.append("shared_buffers", "1MB");
+        conf.append("max_wal_size", "100GB");
         conf.append("fsync", "off");
         conf.append("max_connections", "100");
         conf.append("wal_sender_timeout", "0");
diff --git a/pageserver/src/lib.rs b/pageserver/src/lib.rs
index 660b913b0e..4c4c495923 100644
--- a/pageserver/src/lib.rs
+++ b/pageserver/src/lib.rs
@@ -39,10 +39,10 @@ pub mod defaults {
     // would be more appropriate. But a low value forces the code to be exercised more,
     // which is good for now to trigger bugs.
     pub const DEFAULT_CHECKPOINT_DISTANCE: u64 = 256 * 1024 * 1024;
-    pub const DEFAULT_CHECKPOINT_PERIOD: Duration = Duration::from_secs(1);
+    pub const DEFAULT_CHECKPOINT_PERIOD: Duration = Duration::from_secs(10);
 
     pub const DEFAULT_GC_HORIZON: u64 = 64 * 1024 * 1024;
-    pub const DEFAULT_GC_PERIOD: Duration = Duration::from_secs(100);
+    pub const DEFAULT_GC_PERIOD: Duration = Duration::from_secs(10);
 
     pub const DEFAULT_SUPERUSER: &str = "zenith_admin";
     pub const DEFAULT_REMOTE_STORAGE_MAX_CONCURRENT_SYNC: usize = 100;
diff --git a/zenith/src/main.rs b/zenith/src/main.rs
index 00e3648b99..f872cb1553 100644
--- a/zenith/src/main.rs
+++ b/zenith/src/main.rs
@@ -36,17 +36,10 @@ pg_port = {pageserver_pg_port}
 http_port = {pageserver_http_port}
 auth_type = '{pageserver_auth_type}'
 
-[[safekeepers]]
-name = '{safekeeper_name}'
-pg_port = {safekeeper_pg_port}
-http_port = {safekeeper_http_port}
 "#,
         pageserver_pg_port = DEFAULT_PAGESERVER_PG_PORT,
         pageserver_http_port = DEFAULT_PAGESERVER_HTTP_PORT,
         pageserver_auth_type = AuthType::Trust,
-        safekeeper_name = DEFAULT_SAFEKEEPER_NAME,
-        safekeeper_pg_port = DEFAULT_SAFEKEEPER_PG_PORT,
-        safekeeper_http_port = DEFAULT_SAFEKEEPER_HTTP_PORT,
     )
 }