diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
index d7390fd0da..f4d7e8166c 100755
--- a/parm/config/config.base.emc.dyn
+++ b/parm/config/config.base.emc.dyn
@@ -140,8 +140,8 @@ if [ $machine = "THEIA" ]; then
 fi
 
 #### CCPP Suite
-#### export CCPP_SUITE="FV3_GSD_v0"          # testgsdsuite
-export CCPP_SUITE="FV3_GFS_v15"        # testemc
+export CCPP_SUITE="FV3_GSD_v0"              # testgsdsuite
+#### export CCPP_SUITE="FV3_GFS_v15"        # testemc
 
 # Toggle to turn on/off GFS downstream processing.
 export DO_BUFRSND="NO"
diff --git a/parm/config/config.fcst b/parm/config/config.fcst
index 1c8b59f00d..ef29b8e84c 100755
--- a/parm/config/config.fcst
+++ b/parm/config/config.fcst
@@ -102,11 +102,17 @@ export icliq_sw=2   ;#cloud optical coeffs from AER's newer version v3.9-v4.0 fo
 
 # CCPP configuration
 export output_1st_tstep_rst=".false."                                        #JKH
-export CCPP_SUITE=FV3_GSD_v0
 
 # Convection Options: 2-SASAS, 3-GF
-export imfdeepcnv=3
-export imfshalcnv=3
+if [ $CCPP_SUITE = "FV3_GSD_v0" ]; then
+	export imfdeepcnv=3
+	export imfshalcnv=3
+####        export lheatstrg=.false.
+else
+	export imfdeepcnv=2
+	export imfshalcnv=2
+####        export lheatstrg=.true.
+fi
 
 # Microphysics configuration
 export dnats=0