diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f668630b847..c41051eda89 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -588,8 +588,8 @@ steps:
       - label: ":genie: Diagnostic EDMFX aquaplanet with TKE"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet_tke.yml
-        artifact_paths: "diagnostic_edmfx_aquaplanet_tke/*"
+          --config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet.yml
+        artifact_paths: "diagnostic_edmfx_aquaplanet/*"
         agents:
           slurm_mem: 20GB
       
@@ -617,7 +617,6 @@ steps:
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/prognostic_edmfx_bomex_fixtke_box.yml
         artifact_paths: "prognostic_edmfx_bomex_fixtke_box/*"
-        soft_fail: true
         agents:
           slurm_mem: 20GB
       
@@ -626,7 +625,14 @@ steps:
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/prognostic_edmfx_bomex_box.yml
         artifact_paths: "prognostic_edmfx_bomex_box/*"
-        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+      
+      - label: ":genie: Prognostic EDMFX Bomex stretched grid in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_stretched_box.yml
+        artifact_paths: "prognostic_edmfx_bomex_stretched_box/*"
         agents:
           slurm_mem: 20GB
 
@@ -643,7 +649,6 @@ steps:
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/prognostic_edmfx_rico_column.yml
         artifact_paths: "prognostic_edmfx_rico_column/*"
-        soft_fail: true
         agents:
           slurm_mem: 20GB
 
@@ -652,7 +657,14 @@ steps:
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/prognostic_edmfx_trmm_column.yml
         artifact_paths: "prognostic_edmfx_trmm_column/*"
-        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+      
+      - label: ":genie: Prognostic EDMFX aquaplanet"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_aquaplanet.yml
+        artifact_paths: "prognostic_edmfx_aquaplanet/*"
         agents:
           slurm_mem: 20GB
 
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
similarity index 91%
rename from config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml
rename to config/model_configs/diagnostic_edmfx_aquaplanet.yml
index 6852c580b3d..57e41abb71a 100644
--- a/config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml
+++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -1,4 +1,4 @@
-job_id: diagnostic_edmfx_aquaplanet_tke
+job_id: diagnostic_edmfx_aquaplanet
 vert_diff: "true" 
 surface_setup: DefaultExchangeCoefficients 
 rad: gray
diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml
new file mode 100644
index 00000000000..88bbf1c49a2
--- /dev/null
+++ b/config/model_configs/prognostic_edmfx_aquaplanet.yml
@@ -0,0 +1,18 @@
+job_id: prognostic_edmfx_aquaplanet
+vert_diff: "true" 
+surface_setup: DefaultExchangeCoefficients 
+rad: gray
+turbconv: prognostic_edmfx 
+prognostic_tke: true
+edmfx_upwinding: first_order 
+edmfx_entr_model: "Generalized" 
+edmfx_detr_model: "ConstantArea" 
+edmfx_nh_pressure: true 
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+moist: equil 
+precip_model: 0M
+dt: 10secs 
+t_end: 1hours 
+dt_save_to_disk: 600secs
+toml: [toml/prognostic_edmfx_box.toml]
diff --git a/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml b/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml
new file mode 100644
index 00000000000..dbe8e678210
--- /dev/null
+++ b/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml
@@ -0,0 +1,31 @@
+job_id: "prognostic_edmfx_bomex_stretched_box"
+initial_condition: "Bomex"
+subsidence: "Bomex"
+edmf_coriolis: "Bomex"
+ls_adv: "Bomex"
+surface_setup: "Bomex"
+turbconv: "prognostic_edmfx"
+edmfx_upwinding: first_order
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+edmfx_nh_pressure: true
+prognostic_tke: true
+moist: "equil"
+config: "box"
+hyperdiff: "true"
+kappa_4: 1.0e21
+x_max: 1e8
+y_max: 1e8
+z_max: 3e3
+x_elem: 2
+y_elem: 2
+z_elem: 30
+dz_bottom: 50.0
+dz_top: 200.0
+perturb_initstate: false
+dt: "10secs"
+t_end: "6hours"
+dt_save_to_disk: "10mins"
+toml: [toml/prognostic_edmfx_bomex_box.toml]