diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl
index 439366d9..666aa874 100644
--- a/AGCM.rc.tmpl
+++ b/AGCM.rc.tmpl
@@ -39,7 +39,7 @@ UW_DT: @LONG_DT
 # dynamics options
 # ----------------------------------------
 DYCORE: @DYCORE
-@CONUS FV3_CONFIG: HWT
+@FV_HWT FV3_CONFIG: HWT
 AdvCore_Advection: 0
 ###########################################################
 
@@ -84,7 +84,7 @@ SHALLOW_OPTION: UW
 ###########################################################
 # convection scheme options
 # ----------------------------------------
-CONVPAR_OPTION: GF
+CONVPAR_OPTION: @CONVPAR_OPTION
 #USE_GF2020: 1
 # Convective plumes to be activated (1 true, 0 false)
 DEEP: 1
diff --git a/gcm_setup b/gcm_setup
index e61436b3..4573188f 100755
--- a/gcm_setup
+++ b/gcm_setup
@@ -1025,6 +1025,11 @@ endif
      set NUM_READERS = 1
      set NUM_WRITERS = 1
 
+# Set default CONVPAR_OPTION to GF
+# (set to NONE at C2880 and C5760)
+# --------------------------------
+     set CONVPAR_OPTION = GF
+
 # Default Run Parameters
 # ----------------------
 if( $AGCM_IM ==  "c12" ) then
@@ -1219,6 +1224,7 @@ if( $AGCM_IM == "c2880" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 if( $AGCM_IM == "c5760" ) then
      set       DT = 30
@@ -1240,6 +1246,7 @@ if( $AGCM_IM == "c5760" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 # CONUS Stretched Grids
 set CONUS = '#'
@@ -1417,12 +1424,15 @@ endif
 if ( "$USE_HYDROSTATIC" == "TRUE" ) then
    set FV_MAKENH     = "Make_NH     = .F."
    set FV_HYDRO      = "hydrostatic = .T."
+   set FV_HWT        = '#'
 else
    set FV_MAKENH     = "Make_NH     = .T."
    set FV_HYDRO      = "hydrostatic = .F."
    if ( "$CLDMICRO" == "GFDL_1M" ) then
       set GFDL_HYDRO = ".FALSE."
    endif
+   # Enable FV3_CONFIG: HWT when running non-hydrostatic
+   set FV_HWT        = ''
 endif
 
 if ($CONUS == '#') then
@@ -1435,6 +1445,8 @@ else
   set STRETCH_FAC = "stretch_fac = $STRETCH_FACTOR"
   set TARGET_LON  = "target_lon  = -98.35"
   set TARGET_LAT  = "target_lat  = 39.5"
+  # Always enable FV3_CONFIG: HWT for CONUS
+  set FV_HWT        = ''
 endif
 
 #######################################################################
@@ -2428,6 +2440,8 @@ s/@JOB_SGMT/${JOB_SGMT}/g
 s/@NUM_SGMT/${NUM_SGMT}/g
 
 s/@CONUS/${CONUS}/g
+s/@FV_HWT/${FV_HWT}/g
+s/@CONVPAR_OPTION/${CONVPAR_OPTION}/g
 s/@STRETCH_FACTOR/${STRETCH_FACTOR}/g
 
 s/@INTERPOLATE_SST/$INTERPOLATE_SST/g
diff --git a/geoschemchem_setup b/geoschemchem_setup
index fbb8c9c3..575f8ff6 100755
--- a/geoschemchem_setup
+++ b/geoschemchem_setup
@@ -1025,6 +1025,11 @@ endif
      set NUM_READERS = 1
      set NUM_WRITERS = 1
 
+# Set default CONVPAR_OPTION to GF
+# (set to NONE at C2880 and C5760)
+# --------------------------------
+     set CONVPAR_OPTION = GF
+
 # Default Run Parameters
 # ----------------------
 if( $AGCM_IM ==  "c12" ) then
@@ -1228,6 +1233,7 @@ if( $AGCM_IM == "c2880" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 if( $AGCM_IM == "c5760" ) then
      set       DT = 30
@@ -1250,6 +1256,7 @@ if( $AGCM_IM == "c5760" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 # CONUS Stretched Grids
 set CONUS = '#'
@@ -1432,12 +1439,15 @@ endif
 if ( "$USE_HYDROSTATIC" == "TRUE" ) then
    set FV_MAKENH     = "Make_NH     = .F."
    set FV_HYDRO      = "hydrostatic = .T."
+   set FV_HWT        = '#'
 else
    set FV_MAKENH     = "Make_NH     = .T."
    set FV_HYDRO      = "hydrostatic = .F."
    if ( "$CLDMICRO" == "GFDL_1M" ) then
       set GFDL_HYDRO = ".FALSE."
    endif
+   # Enable FV3_CONFIG: HWT when running non-hydrostatic
+   set FV_HWT        = ''
 endif
 
 if ($CONUS == '#') then
@@ -1450,6 +1460,8 @@ else
   set STRETCH_FAC = "stretch_fac = $STRETCH_FACTOR"
   set TARGET_LON  = "target_lon  = -98.35"
   set TARGET_LAT  = "target_lat  = 39.5"
+  # Always enable FV3_CONFIG: HWT for CONUS
+  set FV_HWT        = ''
 endif
 
 #######################################################################
@@ -2458,6 +2470,8 @@ s/@JOB_SGMT/${JOB_SGMT}/g
 s/@NUM_SGMT/${NUM_SGMT}/g
 
 s/@CONUS/${CONUS}/g
+s/@FV_HWT/${FV_HWT}/g
+s/@CONVPAR_OPTION/${CONVPAR_OPTION}/g
 s/@STRETCH_FACTOR/${STRETCH_FACTOR}/g
 
 /SATSIM_DT/a GEOSCHEMCHEM_DT: $GEOSCHEMCHEM_DT
diff --git a/gmichem_setup b/gmichem_setup
index bacf8111..72c25fa1 100755
--- a/gmichem_setup
+++ b/gmichem_setup
@@ -1122,6 +1122,11 @@ endif
      set NUM_READERS = 1
      set NUM_WRITERS = 1
 
+# Set default CONVPAR_OPTION to GF
+# (set to NONE at C2880 and C5760)
+# --------------------------------
+     set CONVPAR_OPTION = GF
+
 # Default Run Parameters
 # ----------------------
 if( $AGCM_IM ==  "c12" ) then
@@ -1325,6 +1330,7 @@ if( $AGCM_IM == "c2880" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 if( $AGCM_IM == "c5760" ) then
      set       DT = 30
@@ -1347,6 +1353,7 @@ if( $AGCM_IM == "c5760" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 # CONUS Stretched Grids
 set CONUS = '#'
@@ -1529,12 +1536,15 @@ endif
 if ( "$USE_HYDROSTATIC" == "TRUE" ) then
    set FV_MAKENH     = "Make_NH     = .F."
    set FV_HYDRO      = "hydrostatic = .T."
+   set FV_HWT        = '#'
 else
    set FV_MAKENH     = "Make_NH     = .T."
    set FV_HYDRO      = "hydrostatic = .F."
    if ( "$CLDMICRO" == "GFDL_1M" ) then
       set GFDL_HYDRO = ".FALSE."
    endif
+   # Enable FV3_CONFIG: HWT when running non-hydrostatic
+   set FV_HWT        = ''
 endif
 
 if ($CONUS == '#') then
@@ -1547,6 +1557,8 @@ else
   set STRETCH_FAC = "stretch_fac = $STRETCH_FACTOR"
   set TARGET_LON  = "target_lon  = -98.35"
   set TARGET_LAT  = "target_lat  = 39.5"
+  # Always enable FV3_CONFIG: HWT for CONUS
+  set FV_HWT        = ''
 endif
 
 #######################################################################
@@ -2626,6 +2638,8 @@ s/@JOB_SGMT/${JOB_SGMT}/g
 s/@NUM_SGMT/${NUM_SGMT}/g
 
 s/@CONUS/${CONUS}/g
+s/@FV_HWT/${FV_HWT}/g
+s/@CONVPAR_OPTION/${CONVPAR_OPTION}/g
 s/@STRETCH_FACTOR/${STRETCH_FACTOR}/g
 
 s/@INTERPOLATE_SST/$INTERPOLATE_SST/g
diff --git a/stratchem_setup b/stratchem_setup
index 1171ac55..f1db4df1 100755
--- a/stratchem_setup
+++ b/stratchem_setup
@@ -1025,6 +1025,11 @@ endif
      set NUM_READERS = 1
      set NUM_WRITERS = 1
 
+# Set default CONVPAR_OPTION to GF
+# (set to NONE at C2880 and C5760)
+# --------------------------------
+     set CONVPAR_OPTION = GF
+
 # Default Run Parameters
 # ----------------------
 if( $AGCM_IM ==  "c12" ) then
@@ -1228,6 +1233,7 @@ if( $AGCM_IM == "c2880" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 if( $AGCM_IM == "c5760" ) then
      set       DT = 30
@@ -1250,6 +1256,7 @@ if( $AGCM_IM == "c5760" ) then
      set POST_NDS = 32
      set USE_SHMEM = 1
      set DEF_IOS_NDS = 4
+     set CONVPAR_OPTION = NONE
 endif
 # CONUS Stretched Grids
 set CONUS = '#'
@@ -1432,12 +1439,15 @@ endif
 if ( "$USE_HYDROSTATIC" == "TRUE" ) then
    set FV_MAKENH     = "Make_NH     = .F."
    set FV_HYDRO      = "hydrostatic = .T."
+   set FV_HWT        = '#'
 else
    set FV_MAKENH     = "Make_NH     = .T."
    set FV_HYDRO      = "hydrostatic = .F."
    if ( "$CLDMICRO" == "GFDL_1M" ) then
       set GFDL_HYDRO = ".FALSE."
    endif
+   # Enable FV3_CONFIG: HWT when running non-hydrostatic
+   set FV_HWT        = ''
 endif
 
 if ($CONUS == '#') then
@@ -1450,6 +1460,8 @@ else
   set STRETCH_FAC = "stretch_fac = $STRETCH_FACTOR"
   set TARGET_LON  = "target_lon  = -98.35"
   set TARGET_LAT  = "target_lat  = 39.5"
+  # Always enable FV3_CONFIG: HWT for CONUS
+  set FV_HWT        = ''
 endif
 
 #######################################################################
@@ -2444,6 +2456,8 @@ s/@JOB_SGMT/${JOB_SGMT}/g
 s/@NUM_SGMT/${NUM_SGMT}/g
 
 s/@CONUS/${CONUS}/g
+s/@FV_HWT/${FV_HWT}/g
+s/@CONVPAR_OPTION/${CONVPAR_OPTION}/g
 s/@STRETCH_FACTOR/${STRETCH_FACTOR}/g
 
 s/@INTERPOLATE_SST/$INTERPOLATE_SST/g