diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml
index dfd9b57698..7de1a9ea68 100644
--- a/config/longrun_configs/amip_target_diagedmf.yml
+++ b/config/longrun_configs/amip_target_diagedmf.yml
@@ -6,6 +6,7 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 moist: "equil"
+cloud_model: diagnostic_edmfx
 precip_model: "0M"
 override_τ_precip: false
 rad: "allskywithclear"
@@ -26,6 +27,6 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt: "100secs"
-t_end: "40days"
+t_end: "120days"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
 netcdf_output_at_levels: true
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml
index ae28e57525..2d798e3c6c 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml
@@ -4,6 +4,7 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 moist: "equil"
+cloud_model: diagnostic_edmfx
 precip_model: "0M"
 override_τ_precip: false
 rad: "allskywithclear"
@@ -23,5 +24,5 @@ edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
-t_end: "60days"
+t_end: "120days"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml
index 9bc2a30227..4a0c2fb858 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml
@@ -4,6 +4,7 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 moist: "equil"
+cloud_model: diagnostic_edmfx
 precip_model: "0M"
 override_τ_precip: false
 rad: "clearsky"
@@ -23,5 +24,5 @@ edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt_save_state_to_disk: "10days"
 dt: "100secs"
-t_end: "60days"
+t_end: "120days"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
index 89707db99d..3b8aa85cad 100644
--- a/config/model_configs/aquaplanet_diagedmf.yml
+++ b/config/model_configs/aquaplanet_diagedmf.yml
@@ -22,6 +22,7 @@ edmfx_detr_model: "Generalized"
 edmfx_nh_pressure: true 
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
+cloud_model: diagnostic_edmfx
 precip_model: 0M
 dt: 100secs 
 t_end: 12hours 
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
index 49fb8aca01..0aed9c1926 100644
--- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml
+++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -11,6 +11,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 precip_model: 0M
 override_τ_precip: false
 dt: 100secs
diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml
index 870609f678..3e9a044a15 100644
--- a/config/model_configs/diagnostic_edmfx_bomex_box.yml
+++ b/config/model_configs/diagnostic_edmfx_bomex_box.yml
@@ -14,9 +14,9 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: "equil"
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
 config: "box"
-cloud_model: "diagnostic_edmfx"
 x_max: 1e8
 y_max: 1e8
 x_elem: 2
diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
index 725c8da9f1..973cc295cc 100644
--- a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
+++ b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
@@ -14,6 +14,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: "equil"
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
 config: "box"
 x_max: 1e8
diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
index d93156c5d4..7dc5586097 100644
--- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
+++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
@@ -14,6 +14,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml
index c0edacd33e..8832bb34da 100644
--- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml
+++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml
@@ -12,6 +12,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml
index 608793854c..bca0d6f340 100644
--- a/config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml
+++ b/config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml
@@ -14,7 +14,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
-apply_limiter: false
+cloud_model: diagnostic_edmfx
 precip_model: "1M"
 call_cloud_diagnostics_per_stage: true
 config: box
diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml
index 7a219f04bc..9145947e80 100644
--- a/config/model_configs/diagnostic_edmfx_gabls_box.yml
+++ b/config/model_configs/diagnostic_edmfx_gabls_box.yml
@@ -12,6 +12,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml
index 3208d32abd..b9860663d9 100644
--- a/config/model_configs/diagnostic_edmfx_rico_box.yml
+++ b/config/model_configs/diagnostic_edmfx_rico_box.yml
@@ -13,7 +13,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
-apply_limiter: false
+cloud_model: diagnostic_edmfx
 precip_model: "1M"
 call_cloud_diagnostics_per_stage: true
 config: box
diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml
index faf8102ed4..c655f65640 100644
--- a/config/model_configs/diagnostic_edmfx_trmm_box.yml
+++ b/config/model_configs/diagnostic_edmfx_trmm_box.yml
@@ -12,6 +12,7 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
 apply_limiter: false
 precip_model: "1M"
diff --git a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml
index cde06a9918..a8aa2c1c61 100644
--- a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml
+++ b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml
@@ -12,8 +12,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
-apply_limiter: false
 precip_model: "0M"
 override_τ_precip: false
 config: box
diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
index d175b4dd3c..a9ab3a4dc9 100644
--- a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
+++ b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
@@ -13,8 +13,8 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: diagnostic_edmfx
 call_cloud_diagnostics_per_stage: true
-apply_limiter: false
 precip_model: "1M"
 override_τ_precip: false
 config: box