diff --git a/.gitmodules b/.gitmodules
index 1308519e38..df7b852d22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,10 +27,8 @@
 #
 [submodule "fates"]
 path = src/fates
-#url = https://github.com/NGEET/fates
-#fxtag = sci.1.78.3_api.36.1.0
-url = https://github.com/rosiealice/fates
-fxtag = 63021eae
+url = https://github.com/NorESMhub/fates
+fxtag = sci.1.78.3_api.36.1.0_noresm_v1
 fxrequired = AlwaysRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NCAR/fates-release
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 9b83742e2c..56ed65c5ce 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -172,11 +172,9 @@
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>TRUE</default_value>
-    <!-- Until CAM sets dust settings in drv_flds_in this should only be TRUE
     <values>
-      <value compset="CAM"  >FALSE</value>
+      <value compset="CAM">FALSE</value>
     </values>
-    -->
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
     <desc>If CTSM will set the dust settings in drv_flds_in (TRUE), or if ATM (i.e. CAM) will - DO NOT EDIT (set by compset name)</desc>