diff --git a/driver-mct/cime_config/config_component_e3sm.xml b/driver-mct/cime_config/config_component_e3sm.xml
index b53d948be663..2895650d2426 100755
--- a/driver-mct/cime_config/config_component_e3sm.xml
+++ b/driver-mct/cime_config/config_component_e3sm.xml
@@ -177,8 +177,7 @@
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>FALSE</default_value>
     <values match="last">
-      <value compset="_MPASO%IBPISMF_">TRUE</value>
-      <value compset="_MPASO%IBDISMF_">TRUE</value>
+      <value compset="_MPASO%[^_]*ISMF">TRUE</value>
       <value compset="_MPASSI%DIB_">TRUE</value>
     </values>
     <group>run_flags</group>
diff --git a/driver-moab/cime_config/config_component_e3sm.xml b/driver-moab/cime_config/config_component_e3sm.xml
index d0b362b9abd7..044cc1e9f9d6 100644
--- a/driver-moab/cime_config/config_component_e3sm.xml
+++ b/driver-moab/cime_config/config_component_e3sm.xml
@@ -177,8 +177,7 @@
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>FALSE</default_value>
     <values match="last">
-      <value compset="_MPASO%IBPISMF_">TRUE</value>
-      <value compset="_MPASO%IBDISMF_">TRUE</value>
+      <value compset="_MPASO%[^_]*ISMF">TRUE</value>
       <value compset="_MPASSI%DIB_">TRUE</value>
     </values>
     <group>run_flags</group>