diff --git a/.gitmodules b/.gitmodules
index 128615c511..29c99cb5c0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,8 +20,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS.git
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS.git
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS.git
+  branch = bugfix/gnu_compile
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
   url = https://github.com/NOAA-EMC/MOM6
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
index abe90361a6..d182a54f0b 160000
--- a/CMEPS-interface/CMEPS
+++ b/CMEPS-interface/CMEPS
@@ -1 +1 @@
-Subproject commit abe90361a6fc48b6b1513253a2eb0e8baab5b294
+Subproject commit d182a54f0b63f374ac8bf0f9752f9f0001cdd971
diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN
index 4ffdde1ffd..d87c8f44c5 100644
--- a/tests/parm/input.benchmark_ccpp.nml.IN
+++ b/tests/parm/input.benchmark_ccpp.nml.IN
@@ -17,7 +17,7 @@
   fhout = @[NFHOUT]
   fhmaxhf = @[NFHMAX_HF]
   fhouthf = @[NFHOUT_HF]
-  ccpp_suite = @[CCPP_SUITE]
+  ccpp_suite = '@[CCPP_SUITE]'
   
 /
 
diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN
index 1f38e9e8e3..421b546eb7 100644
--- a/tests/parm/input.benchmark_v16.nml.IN
+++ b/tests/parm/input.benchmark_v16.nml.IN
@@ -17,7 +17,7 @@
   fhout = @[NFHOUT]
   fhmaxhf = @[NFHMAX_HF]
   fhouthf = @[NFHOUT_HF]
-  ccpp_suite = @[CCPP_SUITE]
+  ccpp_suite = '@[CCPP_SUITE]'
   
 /
 
diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN
index ec4acdd704..009a21d619 100644
--- a/tests/parm/input.mom6_ccpp.nml.IN
+++ b/tests/parm/input.mom6_ccpp.nml.IN
@@ -16,7 +16,7 @@
        fhout = @[NFHOUT]
        fhmaxhf = @[NFHMAX_HF]
        fhouthf = @[NFHOUT_HF]
-       ccpp_suite = @[CCPP_SUITE]
+       ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml