diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test
index 47b448d04..5136b2ac8 100644
--- a/test/soca/gw/run_jjobs.yaml.test
+++ b/test/soca/gw/run_jjobs.yaml.test
@@ -30,6 +30,12 @@ gw environement:
     OMP_NUM_THREADS: 1
 
 setup_expt config:
+  base:
+    DO_JEDIATMVAR: "NO"
+    DO_JEDIATMENS: "NO"
+    DO_JEDIOCNVAR: "YES"
+    DO_JEDILANDDA: "NO"
+    DO_MERGENSST: "NO"
   ocnanal:
     SOCA_INPUT_FIX_DIR: @HOMEgfs@/sorc/gdas.cd/build/soca_static
     CASE_ANL: C48
diff --git a/ush/soca/run_jjobs.py b/ush/soca/run_jjobs.py
index cbb4a3567..19022498d 100755
--- a/ush/soca/run_jjobs.py
+++ b/ush/soca/run_jjobs.py
@@ -89,7 +89,7 @@ def setupexpt(self):
         """
 
         # Make a copy of the configs
-        origconfig = "${HOMEgfs}/parm/config"
+        origconfig = "${HOMEgfs}/parm/config/gfs"
         self.f.write("\n")
         self.f.write("# Make a copy of config\n")
         self.f.write(f"cp -r {origconfig} .\n")
@@ -102,7 +102,7 @@ def setupexpt(self):
         self.f.write("\n")
         self.f.write("# Setup the experiment\n")
 
-        setupexpt = "${HOMEgfs}/workflow/setup_expt.py cycled "
+        setupexpt = "${HOMEgfs}/workflow/setup_expt.py gfs cycled "
         # Most of the args keys are not used to run the jjobs but are needed to run setup_expt.py
         args = {
             "idate": "${PDY}${cyc}",
@@ -114,7 +114,7 @@ def setupexpt(self):
             "resens": "24",
             "nens": "0",
             "pslot": "${PSLOT}",
-            "configdir": "${PWD}/config",
+            "configdir": "${PWD}/config/gfs",
             "comrot": self.rotdir,
             "expdir": "${EXPDIRS}",
             "yaml": "overwrite_defaults.yaml"}
@@ -155,7 +155,7 @@ def copy_bkgs(self):
         print(f"RUN: {self.RUN}")
 
         # setup COM variables
-        self.f.write("source ${HOMEgfs}/parm/config/config.com\n")
+        self.f.write("source ${HOMEgfs}/parm/config/gfs/config.com\n")
         self.f.write("source ${HOMEgfs}/ush/preamble.sh\n")
         self.precom('COM_OCEAN_HISTORY_PREV', 'COM_OCEAN_HISTORY_TMPL')
         self.precom('COM_ICE_HISTORY_PREV', 'COM_ICE_HISTORY_TMPL')