diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index 7f9b502b5..e5cf00ad1 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -222,7 +222,6 @@ steps:
           slurm_mem_per_cpu: 16G
         soft_fail: true
 
-
   - group: "Current target tests: AMIP surfaces"
 
     steps:
diff --git a/config/longrun_configs/amip_target.yml b/config/longrun_configs/amip_target.yml
index caf43acf7..9b227c762 100644
--- a/config/longrun_configs/amip_target.yml
+++ b/config/longrun_configs/amip_target.yml
@@ -10,6 +10,7 @@ dt_save_state_to_disk: "20days"
 dt_save_to_sol: "10days"
 energy_check: false
 hourly_checkpoint: true
+insolation: "timevarying"
 land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false
diff --git a/config/longrun_configs/amip_target_topo.yml b/config/longrun_configs/amip_target_topo.yml
index d43951f44..40c23b1c2 100644
--- a/config/longrun_configs/amip_target_topo.yml
+++ b/config/longrun_configs/amip_target_topo.yml
@@ -11,6 +11,7 @@ dt_save_state_to_disk: "20days"
 dt_save_to_sol: "10days"
 energy_check: false
 hourly_checkpoint: true
+insolation: "timevarying"
 land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false
diff --git a/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml b/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
index 978cf35fa..dcf5b23fe 100644
--- a/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
+++ b/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
@@ -1,12 +1,15 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
 anim: false
-atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
 dt: "120secs"
+dt_cloud_fraction: "1hours"
 dt_cpl: 120
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
 dt_save_to_sol: "10days"
 energy_check: false
+insolation: "timevarying"
 hourly_checkpoint: false
 land_albedo_type: "map_temporal"
 mode_name: "amip"
diff --git a/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml b/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
index 411d5f24e..3f464f896 100644
--- a/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
+++ b/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
@@ -1,12 +1,15 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
 anim: false
-atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
 dt: "120secs"
+dt_cloud_fraction: "1hours"
 dt_cpl: 120
+dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
 dt_save_to_sol: "10days"
 energy_check: false
+insolation: "timevarying"
 hourly_checkpoint: false
 land_albedo_type: "map_temporal"
 mode_name: "amip"
diff --git a/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml b/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
index 87546b825..a6ebc3a8c 100644
--- a/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
+++ b/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
@@ -1,6 +1,6 @@
 anim: true
 apply_limiter: false
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_allsky_0M.yml"
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
 dt_cpl: 120
diff --git a/config/longrun_configs/slabplanet_aqua_target_nocouple.yml b/config/longrun_configs/slabplanet_aqua_target_nocouple.yml
index 6c90258fd..c4ca3feee 100644
--- a/config/longrun_configs/slabplanet_aqua_target_nocouple.yml
+++ b/config/longrun_configs/slabplanet_aqua_target_nocouple.yml
@@ -1,6 +1,6 @@
 anim: true
 apply_limiter: false
-atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_allsky_0M.yml"
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
 dt_cpl: 8639800