diff --git a/.gitmodules b/.gitmodules
index 2626856b26..921134eeac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,14 +33,14 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/ESCOMP/atmospheric_physics
-	fxtag = atmos_phys0_06_009
+	fxtag = atmos_phys0_05_001
 	fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
 [submodule "camnor_phys"]
 	path = src/physics/camnor_phys
 	url = https://github.com/NorESMhub/CAM-Nor-physics
-	fxtag = camnor_noresm_v0.0.5
+	fxtag = camnor_noresm_v0.0.6
         fxrequired = AlwaysRequired
         fxDONOTUSEurl = https://github.com/CAM-Nor-physics.git
 
diff --git a/bld/config_files/definition.xml b/bld/config_files/definition.xml
index f146ddec7c..4669671f6e 100644
--- a/bld/config_files/definition.xml
+++ b/bld/config_files/definition.xml
@@ -57,8 +57,8 @@ Option to turn on waccmx thermosphere/ionosphere extension: 0 => no, 1 => yes
 <entry id="ionosphere" valid_values="none,wxie" value="none">
 Ionosphere model used in WACCMX.
 </entry>
-<entry id="phys" valid_values="cam3,cam4,cam5,cam6,cam7,held_suarez,adiabatic,kessler,tj2016,grayrad,spcam_sam1mom,spcam_m2005" value="">
-Physics package: cam3, cam4, cam5, cam6, cam7, held_suarez, adiabatic, kessler, tj2016, grayrad, spcam_sam1mom, spcam_m2005.
+<entry id="phys" valid_values="cam4,cam5,cam6,cam7,held_suarez,adiabatic,kessler,tj2016,grayrad,spcam_sam1mom,spcam_m2005" value="">
+Physics package: cam4, cam5, cam6, cam7, held_suarez, adiabatic, kessler, tj2016, grayrad, spcam_sam1mom, spcam_m2005.
 </entry>
 <entry id="hemco" valid_values="0,1" value="0">
 Switch to turn on Harmonized Emissions Component (HEMCO) for chemistry: 0 => no, 1 => yes.
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index bb0d57e7da..32c4570cb9 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -89,16 +89,16 @@
       <machine name="betzy" compiler="intel" category="prealpha_noresm"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:20:00</option>
     </options>
   </test>
 
-  <test compset="F2000climo" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9_P36" testmods="cam/outfrq9s">
+  <test compset="F2000climo" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9_P512" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:25:00</option>
     </options>
   </test>
 
diff --git a/src/atmos_phys b/src/atmos_phys
index 67927f1511..f8ce60bf40 160000
--- a/src/atmos_phys
+++ b/src/atmos_phys
@@ -1 +1 @@
-Subproject commit 67927f15113eb9c5d4a57f2276d67b8ad88c5149
+Subproject commit f8ce60bf40f800623f8eb3065021ec5dfa9e6b45
diff --git a/src/physics/camnor_phys b/src/physics/camnor_phys
index 6910b103ba..ee03d88a0e 160000
--- a/src/physics/camnor_phys
+++ b/src/physics/camnor_phys
@@ -1 +1 @@
-Subproject commit 6910b103ba64968ba8da94886add717e877cb0e1
+Subproject commit ee03d88a0ef4247970d27339a18b4f7d53d93531