diff --git a/ush/setup.sh b/ush/setup.sh
index 03a6cbd25..0b5fcf77f 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -1225,11 +1225,22 @@ NEMS_CONFIG_FP="${EXPTDIR}/${NEMS_CONFIG_FN}"
 #-----------------------------------------------------------------------
 #
 check_var_valid_value "DO_ENSEMBLE" "valid_vals_DO_ENSEMBLE"
-
+#
+# Set DO_ENSEMBLE to either "TRUE" or "FALSE" so we don't have to consider
+# other valid values later on.
+#
+DO_ENSEMBLE=${DO_ENSEMBLE^^}
+if [ "$DO_ENSEMBLE" = "TRUE" ] || \
+   [ "$DO_ENSEMBLE" = "YES" ]; then
+  DO_ENSEMBLE="TRUE"
+elif [ "$DO_ENSEMBLE" = "FALSE" ] || \
+     [ "$DO_ENSEMBLE" = "NO" ]; then
+  DO_ENSEMBLE="FALSE"
+fi
 NDIGITS_ENSMEM_NAMES="0"
 ENSMEM_NAMES=("")
 FV3_NML_ENSMEM_FPS=("")
-if [ "${DO_ENSEMBLE}" = TRUE ]; then
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   NDIGITS_ENSMEM_NAMES="${#NUM_ENS_MEMBERS}"
 # Strip away all leading zeros in NUM_ENS_MEMBERS by converting it to a 
 # decimal (leading zeros will cause bash to interpret the number as an 
diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
index de54d5dfa..08d85408e 100644
--- a/ush/templates/FV3.input.yml
+++ b/ush/templates/FV3.input.yml
@@ -94,8 +94,6 @@ FV3_GFS_2017_gfdlmp:
     satmedmf: !!python/none
     shal_cnv: False
     ttendlim: !!python/none
-  nam_sfcperts: !!python/none
-  nam_stochy: !!python/none
   gfdl_cloud_microphysics_nml: &gfs_gfdl_cloud_mp
     c_cracw: 0.8
     c_paut: 0.5
@@ -177,8 +175,6 @@ FV3_GFS_2017_gfdlmp_regional:
     satmedmf: False
   gfdl_cloud_microphysics_nml:
     <<: *gfs_gfdl_cloud_mp
-  nam_sfcperts: !!python/none
-  nam_stochy: !!python/none
 
 FV3_GFS_v15p2:
   atmos_model_nml:
@@ -263,8 +259,6 @@ FV3_GFS_v15p2:
     xkzm_h: 1.0
     xkzm_m: 1.0
     xkzminv: 0.3
-  nam_sfcperts: !!python/none
-  nam_stochy: !!python/none
   namsfc:
     landice: True
     ldebug: False
@@ -327,8 +321,6 @@ FV3_GFS_v16beta:
     lgfdlmprad: True
     lheatstrg: True
     lsoil: 4
-    nam_sfcperts: !!python/none
-    nam_stochy: !!python/none
     nstf_name: [2, 1, 0, 0, 0]
     prautco: [0.00015, 0.00015]
     psautco: [0.0008, 0.0005]
@@ -344,8 +336,6 @@ FV3_GFS_v16beta:
   namsfc:
     landice: True
     ldebug: False
-  nam_sfcperts: !!python/none
-  nam_stochy: !!python/none
   surf_map_nml: !!python/none
 
 FV3_CPT_v0: