diff --git a/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py b/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
index 7b26c69a94..1e7e5d1313 100755
--- a/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
+++ b/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
@@ -186,7 +186,7 @@ def main():
         "5x5_amazon": ["5x5_amazon"],
         "ne3": ["ne3np4.pg3"],
         "ne16": ["ne16np4.pg3"],
-        "ne30": ["ne30np4.pg3", "ne30.np4pg2", "ne30np4"],
+        "ne30": ["ne30np4.pg3", "ne30np4.pg2", "ne30np4"],
         "ne120": [
             "ne120np4.pg3",
             "ne0np4.ARCTICGRIS.ne30x8",
@@ -418,7 +418,7 @@ def main():
                 sys.argv = [x for x in command.split(" ") if x]
                 main_nml()
                 print(f"generated namelist {namelist}")
-                output = f'time mpiexec {mksurfdata} < {namelist}'
+                output = f"time mpiexec {mksurfdata} < {namelist}"
                 runfile.write(f"{output} \n")
                 check = f"if [ $? != 0 ]; then echo 'Error running resolution {res}'; exit -4; fi"
                 runfile.write(f"{check} \n")
diff --git a/tools/mksurfdata_esmf/Makefile b/tools/mksurfdata_esmf/Makefile
index ab4df7d2b2..51a68b3c7d 100644
--- a/tools/mksurfdata_esmf/Makefile
+++ b/tools/mksurfdata_esmf/Makefile
@@ -132,15 +132,15 @@ DEBUG:
 standard : $(STANDARD)
 
 global-potveg : FORCE
-	$(MKSURFDATA)  --number-of-nodes 3 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 global-present : FORCE
-	$(MKSURFDATA)  --number-of-nodes 3 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 global-present-low-res : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 #
@@ -179,11 +179,11 @@ crop-global-present : FORCE
 	$(BATCHJOBS) $@.sh
 
 crop-global-present-low-res : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-present-ne16 : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-present-ne120 : FORCE
@@ -199,11 +199,11 @@ crop-global-1850 : FORCE
 	$(BATCHJOBS) $@.sh
 
 crop-global-1850-low-res : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-1850-ne16 : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-1850-ne120 : FORCE
@@ -215,11 +215,11 @@ crop-global-hist : FORCE
 	$(BATCHJOBS) $@.sh
 
 crop-global-hist-low-res : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-hist-ne16 : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-hist-ne120 : FORCE
@@ -289,7 +289,7 @@ crop-global-SSP2-4.5-f19 : FORCE
 	$(BATCHJOBS) $@.sh
 
 crop-global-SSP2-4.5-f10 : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-SSP2-4.5-f45 : FORCE
@@ -301,7 +301,7 @@ crop-global-SSP2-4.5-hcru : FORCE
 	$(BATCHJOBS) $@.sh
 
 crop-global-SSP2-4.5-ne3 : FORCE
-	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00
+	$(MKSURFDATA)  --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00
 	$(BATCHJOBS) $@.sh
 
 crop-global-SSP2-4.5-ne16 : FORCE