diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a90966d3d13..4d23df1b6ae 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -558,7 +558,7 @@ steps:
         agents:
           slurm_mem: 20GB
 
-  - group: "EDMFX"
+  - group: "Diagnostic EDMFX"
     steps:
 
       - label: ":genie: Diagnostic EDMFX test in a box"
@@ -641,6 +641,9 @@ steps:
         agents:
           slurm_mem: 20GB
 
+  - group: "Prognostic EDMFX"
+    steps:
+
       - label: ":genie: Prognostic EDMFX GABLS in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
@@ -656,6 +659,14 @@ steps:
         artifact_paths: "prognostic_edmfx_gabls_tke_box/*"
         agents:
           slurm_mem: 20GB
+      
+      - label: ":genie: Prognostic EDMFX GABLS with TKE in a column"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_gabls_tke_column.yml
+        artifact_paths: "prognostic_edmfx_gabls_tke_column/*"
+        agents:
+          slurm_mem: 20GB
 
       - label: ":genie: Prognostic EDMFX Bomex in a box"
         command: >
@@ -666,11 +677,20 @@ steps:
         agents:
           slurm_mem: 20GB
       
-      - label: ":genie: Prognostic EDMFX Bomex with TKE in a box"
+      - label: ":genie: Prognostic EDMFX Bomex in a column"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_column.yml
+        artifact_paths: "prognostic_edmfx_bomex_column/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+      
+      - label: ":genie: Prognostic EDMFX Bomex with TKE in a column"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_tke_box.yml
-        artifact_paths: "prognostic_edmfx_bomex_tke_box/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_tke_column.yml
+        artifact_paths: "prognostic_edmfx_bomex_tke_column/*"
         soft_fail: true
         agents:
           slurm_mem: 20GB
diff --git a/config/model_configs/prognostic_edmfx_bomex_column.yml b/config/model_configs/prognostic_edmfx_bomex_column.yml
new file mode 100644
index 00000000000..1d776662ddb
--- /dev/null
+++ b/config/model_configs/prognostic_edmfx_bomex_column.yml
@@ -0,0 +1,26 @@
+job_id: "prognostic_edmfx_bomex_column"
+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: false
+moist: "equil"
+config: "column"
+hyperdiff: "false"
+z_max: 3e3
+z_elem: 60
+z_stretch: false
+perturb_initstate: false
+dt: "5secs"
+t_end: "6hours"
+dt_save_to_disk: "10mins"
+FLOAT_TYPE: "Float64"
+toml: [toml/prognostic_edmfx_box.toml]
diff --git a/config/model_configs/prognostic_edmfx_bomex_tke_column.yml b/config/model_configs/prognostic_edmfx_bomex_tke_column.yml
new file mode 100644
index 00000000000..ba84ebe6607
--- /dev/null
+++ b/config/model_configs/prognostic_edmfx_bomex_tke_column.yml
@@ -0,0 +1,26 @@
+job_id: "prognostic_edmfx_bomex_tke_column"
+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: "column"
+hyperdiff: "false"
+z_max: 3e3
+z_elem: 60
+z_stretch: false
+perturb_initstate: false
+dt: "5secs"
+t_end: "6hours"
+dt_save_to_disk: "10mins"
+FLOAT_TYPE: "Float64"
+toml: [toml/prognostic_edmfx_box.toml]
diff --git a/config/model_configs/prognostic_edmfx_gabls_tke_column.yml b/config/model_configs/prognostic_edmfx_gabls_tke_column.yml
new file mode 100644
index 00000000000..b166cc4f238
--- /dev/null
+++ b/config/model_configs/prognostic_edmfx_gabls_tke_column.yml
@@ -0,0 +1,26 @@
+job_id: "prognostic_edmfx_gabls_tke_column"
+initial_condition: GABLS
+edmf_coriolis: GABLS
+surface_setup: GABLS
+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: "column"
+hyperdiff: "false"
+z_max: 400
+x_elem: 2
+y_elem: 2
+z_elem: 8
+z_stretch: false
+dt: "5secs"
+t_end: "9hours"
+dt_save_to_disk: "10mins"
+perturb_initstate: false
+FLOAT_TYPE: "Float64"
+toml: [toml/prognostic_edmfx_box.toml]