diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg
index a8bf3ccb..8eba8b71 100644
--- a/tests/integration/generated/test_bundles_chrysalis.cfg
+++ b/tests/integration/generated/test_bundles_chrysalis.cfg
@@ -7,11 +7,11 @@ input = "/lcrc/group/e3sm/ac.forsyth2/E3SMv2/v2.LR.historical_0201"
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
 # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue_518/v2.LR.historical_0201"
 partition = "compute"
 qos = "regular"
 walltime = "07:00:00"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue_518"
 
 [bundle]
 
diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg
index b96d5f3c..fb6e5c06 100644
--- a/tests/integration/generated/test_complete_run_chrysalis.cfg
+++ b/tests/integration/generated/test_complete_run_chrysalis.cfg
@@ -7,10 +7,10 @@ input = "/lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201"
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
 # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue_518/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_518"
 
 [climo]
 active = True
@@ -93,7 +93,7 @@ years = "1850:1854:2", "1850:1854:4",
   walltime = "5:00:00"
 
   [[ atm_monthly_180x360_aave_environment_commands ]]
-  environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20231027v2"
+  environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240123"
   sets = "qbo",
   ts_subsection = "atm_monthly_180x360_aave"
 
@@ -116,6 +116,7 @@ years = "1850:1854:2", "1850:1854:4",
   ref_years = "1850-1851",
   reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
+  sets = "lat_lon","lat_lon_land","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
   short_ref_name = "v2.LR.historical_0201"
   swap_test_ref = False
   tag = "model_vs_model"
diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg
index e4b1cd06..3c7d4433 100644
--- a/tests/integration/template_complete_run.cfg
+++ b/tests/integration/template_complete_run.cfg
@@ -116,6 +116,7 @@ years = "1850:1854:2", "1850:1854:4",
   ref_years = "1850-1851",
   reference_data_path = "#expand user_output#zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
+  sets = "lat_lon","lat_lon_land","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
   short_ref_name = "v2.LR.historical_0201"
   swap_test_ref = False
   tag = "model_vs_model"
diff --git a/tests/integration/utils.py b/tests/integration/utils.py
index 45f63d8e..a091ad20 100644
--- a/tests/integration/utils.py
+++ b/tests/integration/utils.py
@@ -7,7 +7,7 @@
 from mache import MachineInfo
 from PIL import Image, ImageChops, ImageDraw
 
-UNIQUE_ID = "unique_id"
+UNIQUE_ID = "issue_518"
 
 # Image checking ##########################################################
 
@@ -136,7 +136,7 @@ def get_chyrsalis_expansions(config):
         "bundles_walltime": "07:00:00",
         "constraint": "",
         # To run this test, replace conda environment with your e3sm_diags dev environment
-        "diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20231027v2",
+        "diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240123",
         "diags_walltime": "5:00:00",
         "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc16_chrysalis.sh",
         "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/",
diff --git a/zppy/templates/e3sm_diags.bash b/zppy/templates/e3sm_diags.bash
index e34a1b48..796b7a3f 100644
--- a/zppy/templates/e3sm_diags.bash
+++ b/zppy/templates/e3sm_diags.bash
@@ -138,7 +138,7 @@ create_links_ts_rof()
   cd ..
 }
 
-{%- if ("lat_lon" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
+{%- if ("lat_lon" in sets) or ("lat_lon_land" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
 {% if run_type == "model_vs_obs" %}
 climo_dir_primary=climo
 {% elif run_type == "model_vs_model" %}
@@ -257,13 +257,13 @@ ref_start_yr = {{ ref_start_yr }}
 param = CoreParameter()
 
 # Model
-{%- if ("lat_lon" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
+{%- if ("lat_lon" in sets) or ("lat_lon_land" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
 param.test_data_path = '${climo_dir_primary}'
 {%- endif %}
 param.test_name = '${case}'
 param.short_test_name = short_name
 
-{%- if ("lat_lon" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
+{%- if ("lat_lon" in sets) or ("lat_lon_land" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
 {% if run_type == "model_vs_obs" %}
 # Obs
 param.reference_data_path = '{{ reference_data_path }}'
@@ -293,6 +293,10 @@ param.num_workers = {{ num_workers }}
 #param.fail_on_incomplete = True
 params = [param]
 
+{%- if "lat_lon_land" in sets %}
+param.variables = ["FLDS", "FSDS"]
+{%- endif %}
+
 {%- if "enso_diags" in sets %}
 enso_param = EnsoDiagsParameter()
 enso_param.test_data_path = test_ts