diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fa4c6538cc..29320d02d9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -270,6 +270,13 @@ steps:
       #   command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --coupled true --surface_setup PrescribedSurface --moist equil --vert_diff true --rad allskywithclear --rayleigh_sponge false --energy_check true --mode_name slabplanet --t_end 10days --dt_save_to_sol 3600secs --dt_cpl 21600 --dt 200secs --dt_rad 6hours --idealized_insolation true --mono_surface true --h_elem 4 --precip_model 0M --run_name target_params_in_slab1"
       #   artifact_paths: "experiments/AMIP/output/slabplanet/target_params_in_slab1_artifacts/total_energy*.png"
 
+      - label: "AMIP target: albedo from function"
+        key: "target_amip_albedo_function"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/target_amip_albedo_function.yml"
+        artifact_paths: "experiments/AMIP/output/amip/target_amip_albedo_function_artifacts/*"
+        agents:
+          slurm_mem: 20GB
+
       - label: "AMIP - Float64 + hourly checkpoint"
         key: "amip"
         command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/coarse_single_ft64_hourly_checkpoints.yml"
@@ -354,6 +361,17 @@ steps:
           slurm_mem: 20GB
           slurm_gpus: 1
 
+      # GPU RUNS: AMIP
+      - label: "GPU AMIP target: albedo from function"
+        key: "gpu_target_amip_albedo_function"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/target_amip_albedo_function.yml"
+        artifact_paths: "experiments/AMIP/output/gpu/amip/target_amip_albedo_function_artifacts/*"
+        agents:
+          slurm_mem: 20GB
+          slurm_gpus: 1
+
+      - wait
+
   - wait
 
   # plot job performance history
diff --git a/config/model_configs/target_amip_albedo_function.yml b/config/model_configs/target_amip_albedo_function.yml
new file mode 100644
index 0000000000..f8f7c25eda
--- /dev/null
+++ b/config/model_configs/target_amip_albedo_function.yml
@@ -0,0 +1,25 @@
+alpha_rayleigh_uh: 0
+alpha_rayleigh_w: 10
+apply_limiter: false
+dt: "150secs"
+dt_cpl: 150
+dt_rad: "1hours"
+dt_save_to_sol: "1days"
+dz_bottom: 30
+dz_top: 3000
+energy_check: false
+h_elem: 16
+job_id: "target_amip_albedo_function"
+kappa_4: 1e16
+land_albedo_type: "function"
+mode_name: "amip"
+moist: "equil"
+mono_surface: false
+precip_model: "0M"
+rad: "gray"
+rayleigh_sponge: true
+run_name: "target_amip_albedo_function"
+t_end: "300secs"
+vert_diff: "true"
+z_elem: 50
+z_stretch: false
diff --git a/config/model_configs/target_amip_n1_shortrun.yml b/config/model_configs/target_amip_gpu_shortrun.yml
similarity index 78%
rename from config/model_configs/target_amip_n1_shortrun.yml
rename to config/model_configs/target_amip_gpu_shortrun.yml
index ef1ce0b82a..3292697f26 100644
--- a/config/model_configs/target_amip_n1_shortrun.yml
+++ b/config/model_configs/target_amip_gpu_shortrun.yml
@@ -1,24 +1,25 @@
+run_name: "target_amip_gpu_shortrun"
+moist: "equil"
+vert_diff: "true"
+rad: "gray"
+z_elem: 50
+dz_top: 3000
+dz_bottom: 30
+h_elem: 16
+kappa_4: 1e16
+z_stretch: false
+rayleigh_sponge: true
 alpha_rayleigh_uh: 0
 alpha_rayleigh_w: 10
-apply_limiter: false
-dt: "150secs"
 dt_cpl: 150
+dt: "150secs"
 dt_rad: "1hours"
-dt_save_to_sol: "1days"
-dz_bottom: 30
-dz_top: 3000
 energy_check: false
-h_elem: 16
-job_id: "target_amip_n1_shortrun"
-kappa_4: 1e16
 mode_name: "amip"
-moist: "equil"
+t_end: "0.01days"
+dt_save_to_sol: "1days"
 mono_surface: false
 precip_model: "0M"
-rad: "gray"
-rayleigh_sponge: true
-run_name: "target_amip_n1_shortrun"
-t_end: "0.01days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
+apply_limiter: false
+land_albedo_type: "function"
+job_id: "target_amip_gpu_shortrun"