diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index d433ba8698..fff3f2eb86 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -2264,6 +2264,7 @@ sub setup_logic_params_file {
 
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'paramfile',
               'phys'=>$nl_flags->{'phys'},
+              'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
               'use_flexibleCN'=>$nl_flags->{'use_flexibleCN'} );
 }
 
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 366b504d3e..eafe56d4d1 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -304,6 +304,10 @@ Caveats:
       <value compset="_BGC%BPRP"   >prognostic</value>
       <value compset="HIST.*_DATM" >diagnostic</value>
       <value compset="SSP.*_DATM"  >diagnostic</value>
+      <value compset="1850_DATM[^_]*_CLM60">diagnostic</value>
+      <value compset="2000_DATM[^_]*_CLM60">diagnostic</value>
+      <value compset="2010_DATM[^_]*_CLM60">diagnostic</value>
+      <value compset="^1850_DATM[^_]*_CLM[^_]*NOANTHRO" >constant</value>
     </values>
     <group>run_component_ctsm</group>
     <file>env_run.xml</file>
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index a1c6a1128d..da31597942 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -783,6 +783,16 @@
   <!-- changes to driver xml variables - in case of a tie in the values matches the last match is taken -->
 
   <entries>
+
+    <entry id="DATM_CO2_TSERIES">
+      <values>
+        <value compset="1850_DATM[^_]*_CLM60">cmip7_20tr</value>
+        <value compset="2000_DATM[^_]*_CLM60">cmip7_20tr</value>
+        <value compset="HIST_DATM[^_]*_CLM60">cmip7_20tr</value>
+        <value compset="^1850_DATM[^_]*_CLM[^_]*NOANTHRO" >none</value>
+      </values>
+    </entry>
+
     <entry id="RUN_STARTDATE">
       <values>
 	<value compset="HIST_"			  >1850-01-01</value>