diff --git a/config/amip_configs/amip.yml b/config/amip_configs/amip.yml
index 7e83976f5d..b010e0ac41 100644
--- a/config/amip_configs/amip.yml
+++ b/config/amip_configs/amip.yml
@@ -26,4 +26,4 @@ topography: "Earth"
 turb_flux_partition: "CombinedStateFluxesMOST"
 viscous_sponge: true
 z_elem: 63
-z_max: 55000.0
+z_max: 65000.0
diff --git a/config/nightly_configs/amip_coarse.yml b/config/nightly_configs/amip_coarse.yml
index ee3c3fbf23..8c033b16e1 100644
--- a/config/nightly_configs/amip_coarse.yml
+++ b/config/nightly_configs/amip_coarse.yml
@@ -23,10 +23,10 @@ rayleigh_sponge: true
 smoothing_order: 10
 start_date: "20100101"
 surface_setup: "PrescribedSurface"
-t_end: "732days"
+t_end: "549days"
 topo_smoothing: true
 topography: "Earth"
 turb_flux_partition: "CombinedStateFluxesMOST"
 viscous_sponge: true
-z_elem: 31
-z_max: 55000.0
+z_elem: 39
+z_max: 65000.0
diff --git a/config/nightly_configs/amip_coarse_random.yml b/config/nightly_configs/amip_coarse_random.yml
index 66973a5f33..329deb19ef 100644
--- a/config/nightly_configs/amip_coarse_random.yml
+++ b/config/nightly_configs/amip_coarse_random.yml
@@ -22,11 +22,11 @@ rayleigh_sponge: true
 smoothing_order: 10
 start_date: "20100101"
 surface_setup: "PrescribedSurface"
-t_end: "732days"
+t_end: "549days"
 topo_smoothing: true
 topography: "Earth"
 turb_flux_partition: "CombinedStateFluxesMOST"
 unique_seed: true
 viscous_sponge: true
-z_elem: 31
-z_max: 55000.0
+z_elem: 39
+z_max: 65000.0
diff --git a/toml/amip.toml b/toml/amip.toml
index 19c521eb48..a0612d128e 100644
--- a/toml/amip.toml
+++ b/toml/amip.toml
@@ -2,10 +2,10 @@
 value = 10.0
 
 [zd_rayleigh]
-value = 35000.0
+value = 45000.0
 
 [zd_viscous]
-value = 35000.0
+value = 45000.0
 
 [precipitation_timescale]
 value = 600