diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index dccc69b96d3..e929ce256fd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -281,15 +281,6 @@ steps:
         artifact_paths: "deep_sphere_baroclinic_wave_rhoe_equilmoist/output_active/*"
         agents:
           slurm_constraint: icelake|cascadelake|skylake|epyc
-      
-      - label: ":computer: test DYAMOND interpolated initial conditions"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $GPU_CONFIG_PATH/gpu_aquaplanet_dyamond_summer.yml
-          --job_id gpu_aquaplanet_dyamond_summer
-        artifact_paths: "gpu_aquaplanet_dyamond_summer/output_active/*"
-        agents:
-          slurm_constraint: icelake|cascadelake|skylake|epyc
 
       # Add this back when we figure out what to do with SSP and zalesak
       # - label: ":computer: SSP zalesak tracer & energy upwind baroclinic wave (ρe_tot) equilmoist"
@@ -974,6 +965,18 @@ steps:
         agents:
           slurm_gpus: 1
           slurm_mem: 16G
+      
+      - label: ":computer: test DYAMOND interpolated initial conditions"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $GPU_CONFIG_PATH/gpu_aquaplanet_dyamond_summer.yml
+          --job_id gpu_aquaplanet_dyamond_summer
+        artifact_paths: "gpu_aquaplanet_dyamond_summer/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+          slurm_mem: 16G
 
       - label: "GPU: Diagnostic EDMFX aquaplanet"
         key: "diagnostic_edmfx_aquaplanet_gpu"
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_summer.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_summer.yml
index 95cb7013de2..53d2c79c741 100644
--- a/config/gpu_configs/gpu_aquaplanet_dyamond_summer.yml
+++ b/config/gpu_configs/gpu_aquaplanet_dyamond_summer.yml
@@ -1,6 +1,5 @@
 dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
-output_default_diagnostics: false
 h_elem: 16
 z_max: 60000.0
 z_elem: 63
@@ -13,12 +12,12 @@ rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"
-dt: "5secs"
-t_end: "30secs"
+dt: "60secs"
+t_end: "30mins"
 toml: [toml/longrun_aquaplanet.toml]
 prescribe_ozone: true
 aerosol_radiation: true
@@ -26,6 +25,3 @@ prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 start_date: "20160801"
 initial_condition: "artifact\"DYAMOND_SUMMER_ICS_p98deg\"/DYAMOND_SUMMER_ICS_p98deg.nc"
 topography: "Earth"
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr, rv]
-    period: "30secs"