diff --git a/.gitmodules b/.gitmodules
index d43c5bb0ba..f96873bde1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "sorc/ufs_model.fd"]
   path = sorc/ufs_model.fd
-  url = https://github.com/kayeekayee/ufs-weather-model.git
-  branch = 2024jul19_c127601
+  url = https://github.com/NOAA-GSL/ufs-weather-model
+  ignore = dirty
 [submodule "sorc/wxflow"]
   path = sorc/wxflow
   url = https://github.com/NOAA-EMC/wxflow
@@ -10,8 +10,7 @@
   url = https://github.com/NOAA-EMC/gfs-utils
 [submodule "sorc/ufs_utils.fd"]
   path = sorc/ufs_utils.fd
-  url = https://github.com/kayeekayee/UFS_UTILS.git
-  branch = 2024aug4_3ef2e6b
+  url = https://github.com/NOAA-GSL/UFS_UTILS.git
 [submodule "sorc/verif-global.fd"]
   path = sorc/verif-global.fd
   url = https://github.com/NOAA-EMC/EMC_verif-global.git
diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst
index 44f137eace..89165d984e 100644
--- a/parm/config/gfs/config.fcst
+++ b/parm/config/gfs/config.fcst
@@ -137,7 +137,7 @@ export d2_bg_k2=0.04
 export dz_min=6
 export n_sponge=42
 
-# PBL/turbulance schemes
+# PBL/turbulence schemes
 export hybedmf=".false."
 if [[ "${CCPP_SUITE}" == "FV3_global_nest"* ]]; then
   export satmedmf=".false."
@@ -149,7 +149,7 @@ export isatmedmf=1
 if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_c3_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" ]] ; then
    export satmedmf=".false."
    export isatmedmf=0
-   export CPP
+   export shal_cnv=".false."
    export do_mynnedmf=".true."
    export do_mynnsfclay=".false."
    export icloud_bl=1
@@ -214,6 +214,10 @@ else
     fi
 fi
 #JKH
+#Convection schemes      ### JKH  - affects field table name
+tbp=""
+if [ "$progsigma" = ".true." ]; then tbp="_progsigma" ; fi
+
 
 # Microphysics configuration
 export dnats=0