diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index 5c2d9e791..439106edf 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -14,6 +14,8 @@ env:
 
   CONFIG_PATH: "config/longrun_configs"
   PERF_CONFIG_PATH: "config/perf_configs"
+  MODEL_CONFIG_PATH: "config/model_configs"
+  ATMOS_CONFIG_PATH: "config/atmos_configs"
 
 timeout_in_minutes: 1440
 
@@ -408,3 +410,42 @@ steps:
         command:
           - slack-upload -c "#coupler-report" -f perf/output/perf_diff_target_amip_n1_shortrun/flame_diff.html -m png -n amip_fine_flamegraphdiff -x "AMIP Longrun FlameGraphDiff"
           - slack-upload -c "#coupler-report" -f perf/output/perf_diff_target_amip_n1_shortrun/flame_diff_self_count.html -m png -n amip_fine_flamegraphdiffself -x "AMIP Longrun FlameGraphDiffSelf"
+
+  - group: "Table output targets"
+
+    steps:
+
+      - label: "GPU AMIP DYAMOND"
+        key: "gpu_amip_dyamond"
+        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $MODEL_CONFIG_PATH/gpu_amip_dyamond.yml"
+        artifact_paths: "experiments/AMIP/output/amip/gpu_amip_dyamond_artifacts/*"
+        agents:
+          slurm_gpus: 1
+          slurm_mem: 16GB
+
+      - label: "CPU AMIP DYAMOND"
+        key: "amip_dyamond"
+        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $MODEL_CONFIG_PATH/amip_dyamond.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_dyamond_artifacts/*"
+        agents:
+          slurm_ntasks_per_node: 1
+          slurm_nodes: 1
+          slurm_mem_per_cpu: 16G
+
+      # Note: These config files live in the ClimaAtmos repository
+      - label: "GPU aquaplanet DYAMOND"
+        key: "gpu_aquaplanet_dyamond"
+        command: "srun julia --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $ATMOS_CONFIG_PATH/gpu_aquaplanet_dyamond.yml"
+        artifact_paths: "experiments/AMIP/output/gpu_aquaplanet_dyamond/*"
+        agents:
+          slurm_gpus: 1
+          slurm_mem: 16GB
+
+      - label: "CPU aquaplanet DYAMOND"
+        key: "aquaplanet_dyamond"
+        command: "srun julia --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $ATMOS_CONFIG_PATH/aquaplanet_dyamond.yml"
+        artifact_paths: "experiments/AMIP/output/aquaplanet_dyamond/*"
+        agents:
+          slurm_ntasks_per_node: 1
+          slurm_nodes: 1
+          slurm_mem_per_cpu: 16G
diff --git a/config/atmos_configs/aquaplanet_dyamond.yml b/config/atmos_configs/aquaplanet_dyamond.yml
new file mode 100644
index 000000000..bae819ee7
--- /dev/null
+++ b/config/atmos_configs/aquaplanet_dyamond.yml
@@ -0,0 +1,23 @@
+dt_save_state_to_disk: "Inf"
+dt_save_to_sol: "Inf"
+output_default_diagnostics: false
+h_elem: 30
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+rad: "allskywithclear"
+idealized_insolation: false
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+vert_diff: "FriersonDiffusion"
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+surface_setup: "DefaultMoninObukhov"
+rayleigh_sponge: true
+dt: "100secs"
+t_end: "12hours"
+job_id: "aquaplanet_dyamond"
+toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/atmos_configs/gpu_aquaplanet_dyamond.yml b/config/atmos_configs/gpu_aquaplanet_dyamond.yml
new file mode 100644
index 000000000..ee4164b8a
--- /dev/null
+++ b/config/atmos_configs/gpu_aquaplanet_dyamond.yml
@@ -0,0 +1,23 @@
+dt_save_state_to_disk: "Inf"
+dt_save_to_sol: "Inf"
+output_default_diagnostics: false
+h_elem: 30
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+rad: "allskywithclear"
+idealized_insolation: false
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+vert_diff: "FriersonDiffusion"
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+surface_setup: "DefaultMoninObukhov"
+rayleigh_sponge: true
+dt: "100secs"
+t_end: "12hours"
+job_id: "gpu_aquaplanet_dyamond"
+toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/test/component_model_tests/climaatmos_standalone/atmos_driver.jl b/test/component_model_tests/climaatmos_standalone/atmos_driver.jl
index 760b16222..5b995d0cd 100644
--- a/test/component_model_tests/climaatmos_standalone/atmos_driver.jl
+++ b/test/component_model_tests/climaatmos_standalone/atmos_driver.jl
@@ -29,7 +29,7 @@ if !(isnothing(atmos_config_file))
     config = CA.default_config_dict()
 else
     @info "Using Atmos configuration from $atmos_config_file"
-    config = CA.override_default_config(joinpath(pkgdir(CA), atmos_config_file))
+    config = CA.override_default_config(joinpath(pkgdir(ClimaCoupler), atmos_config_file))
 end
 
 # Specify atmos output directory to be inside the coupler output directory
diff --git a/toml/longrun_aquaplanet_dyamond.toml b/toml/longrun_aquaplanet_dyamond.toml
new file mode 100644
index 000000000..1d847702d
--- /dev/null
+++ b/toml/longrun_aquaplanet_dyamond.toml
@@ -0,0 +1,5 @@
+[zd_rayleigh]
+value = 35000.0
+
+[alpha_rayleigh_uh]
+value = 0.0