diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index da42d35f8..a87d9d2dd 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -226,6 +226,18 @@ steps:
           slurm_ntasks_per_node: 16
           slurm_nodes: 4
           slurm_mem_per_cpu: 16G
+      
+      - label: "MPI AMIP FINE: new target amip: topo + diagedmf"
+        key: "amip_target_topo_diagedmf"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target_topo_diagedmf.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_target_topo_diagedmf_artifacts/*"
+        env:
+          CLIMACORE_DISTRIBUTED: "MPI"
+          BUILD_HISTORY_HANDLE: ""
+        agents:
+          slurm_ntasks_per_node: 16
+          slurm_nodes: 4
+          slurm_mem_per_cpu: 20G
 
 
   - group: "Other AMIP targets"
diff --git a/config/longrun_configs/amip_target_topo_diagedmf.yml b/config/longrun_configs/amip_target_topo_diagedmf.yml
new file mode 100644
index 000000000..c66af005b
--- /dev/null
+++ b/config/longrun_configs/amip_target_topo_diagedmf.yml
@@ -0,0 +1,25 @@
+run_name: "amip_target_topo_diagedmf"
+anim: true
+dt_cpl: 100
+energy_check: false
+mode_name: "amip"
+mono_surface: false
+dt: "100secs"
+t_end: "40days"
+job_id: "amip_target_topo_diagedmf"
+dt_save_to_sol: "10days"
+dt_save_state_to_disk: "20days"
+apply_limiter: false
+hourly_checkpoint: true
+turb_flux_partition: "CombinedStateFluxes"
+atmos_config_file: "config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml"
+surface_setup: "PrescribedSurface"
+land_albedo_type: "map_temporal"
+start_date: "19790301"
+topography: "Earth"
+topo_smoothing: true
+FLOAT_TYPE: "Float32"
+idealized_insolation: false
+dt_rad: "1hours"
+dt_cloud_fraction: "1hours"
+netcdf_output_at_levels: true