diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 4284c688f..90f91058b 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -40,7 +40,7 @@
     </mach>
   </grid>
 
-  <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v2">
+  <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v[23]">
     <mach name="derecho">
       <pes pesize="M" compset="CAM.*%MT.*MOM6(?!.*%MARBL-BIO)">
 	<comment></comment>
@@ -111,18 +111,18 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v2">
+  <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v[23]">
     <mach name="derecho">
       <pes pesize="M" compset="CAM.*%MT.*MOM6%[^_]*MARBL-BIO">
 	<comment></comment>
 	<ntasks>
 	  <ntasks_atm>5400</ntasks_atm>
-	  <ntasks_lnd>1792</ntasks_lnd>
-	  <ntasks_rof>1792</ntasks_rof>
-	  <ntasks_ice>3608</ntasks_ice>
-	  <ntasks_ocn>3300</ntasks_ocn>
-	  <ntasks_glc>4</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
+	  <ntasks_lnd>5400</ntasks_lnd>
+	  <ntasks_rof>104</ntasks_rof>
+	  <ntasks_ice>5400</ntasks_ice>
+	  <ntasks_ocn>2560</ntasks_ocn>
+	  <ntasks_glc>104</ntasks_glc>
+	  <ntasks_wav>104</ntasks_wav>
 	  <ntasks_cpl>5400</ntasks_cpl>
 	</ntasks>
 	<nthrds>
@@ -138,9 +138,9 @@
 	<rootpe>
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>1792</rootpe_ice>
-	  <rootpe_ocn>5404</rootpe_ocn>
+	  <rootpe_rof>5400</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>5504</rootpe_ocn>
 	  <rootpe_glc>5400</rootpe_glc>
 	  <rootpe_wav>5400</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>
@@ -413,7 +413,7 @@
 	</pes>
       </mach>
     </grid>
-    <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v2">
+    <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v[23]">
       <mach name="any">
         <pes pesize="M" compset="CAM.*%MT.*MOM6">
           <CAM_CONFIG_OPTS append="True">'-pcols 9'</CAM_CONFIG_OPTS>