diff --git a/parm/config/gfs/config.ufs_c768_12x12_2th_1wg40wt b/parm/config/gfs/config.ufs_c768_12x12_2th_1wg40wt
index 9b9c5ceb45..924d78e14a 100644
--- a/parm/config/gfs/config.ufs_c768_12x12_2th_1wg40wt
+++ b/parm/config/gfs/config.ufs_c768_12x12_2th_1wg40wt
@@ -276,7 +276,7 @@ export cplice=".false."
 export cplchm=".false."
 export cplwav=".false."
 export cplwav2atm=".false."
-export CCPP_SUITE="FV3_GFS_v17_p8_ugwpv1"
+export CCPP_SUITE="FV3_GFS_v17_p8_ugwpv1_mynn"
 model_list="atm"
 
 # Mediator specific settings
diff --git a/workflow/gsl_template_hera.xml b/workflow/gsl_template_hera.xml
index 36080f43a9..faa930a357 100644
--- a/workflow/gsl_template_hera.xml
+++ b/workflow/gsl_template_hera.xml
@@ -15,6 +15,7 @@
 	<!ENTITY JOBS_DIR "&HOMEgfs;/jobs/rocoto">
         <!ENTITY ICSDIR "/scratch1/BMC/gsd-fv3/rtruns/FV3ICS_L127">
         <!ENTITY CASE     "C768">
+        <!ENTITY ATCFNAME "">
         <!ENTITY COMPONENT "atmos">
 	<!ENTITY NATIVE_STR "--export=NONE">
 	<!ENTITY MAXTRIES "2">
@@ -152,7 +153,6 @@
 
 </metatask>
 
-<!--
 <task name="gfsarch" cycledefs="gfs" maxtries="&MAXTRIES;">
 
 	<command>&JOBS_DIR;/arch.sh</command>
@@ -169,10 +169,11 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfsarch.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
+        <envar><name>ATCFNAME</name><value>&ATCFNAME;</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>
 	<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
@@ -182,15 +183,11 @@
 	<envar><name>DATAROOT</name><value>&ROTDIR;/../RUNDIRS/&PSLOT;</value></envar>
 
 	<dependency>
-		<and>
-			<taskdep task="gfstracker"/>
-			<taskdep task="gfsgenesis"/>
-			<metataskdep metatask="gfsatmprod"/>
-		</and>
+		<metataskdep metatask="gfsatmprod"/>
 	</dependency>
 
 </task>
-
+<!--
 <task name="gfscleanup" cycledefs="gfs" maxtries="&MAXTRIES;">
 
 	<command>&JOBS_DIR;/cleanup.sh</command>
@@ -207,9 +204,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfscleanup.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>
diff --git a/workflow/gsl_template_jet.xml b/workflow/gsl_template_jet.xml
index 616f952411..21bfd30428 100644
--- a/workflow/gsl_template_jet.xml
+++ b/workflow/gsl_template_jet.xml
@@ -209,9 +209,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfsarch.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>
@@ -247,9 +247,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfscleanup.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>
diff --git a/workflow/hosts/hera_gsl.yaml b/workflow/hosts/hera_gsl.yaml
index ea917d4790..c12cac1559 100644
--- a/workflow/hosts/hera_gsl.yaml
+++ b/workflow/hosts/hera_gsl.yaml
@@ -5,8 +5,8 @@ PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara'
 COMROOT: '/scratch1/NCEPDEV/global/glopara/com'
 COMINsyn: '${COMROOT}/gfs/prod/syndat'
 HOMEDIR: '/scratch1/BMC/gsd-fv3-dev/NCEPDEV/global/${USER}'
-STMP: '${HOMEgfs}/${PSLOT}/FV3GFSrun/'
-PTMP: '${HOMEgfs}/${PSLOT}/FV3GFSrun/'
+STMP: '${HOMEgfs}/FV3GFSrun/'
+PTMP: '${HOMEgfs}/FV3GFSrun/'
 NOSCRUB: $HOMEDIR
 ACCOUNT: gsd-fv3
 SCHEDULER: slurm
diff --git a/workflow/hosts/hera_gsl_rt.yaml b/workflow/hosts/hera_gsl_rt.yaml
index 0a7c658f21..4297b61777 100644
--- a/workflow/hosts/hera_gsl_rt.yaml
+++ b/workflow/hosts/hera_gsl_rt.yaml
@@ -5,8 +5,8 @@ PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara'
 COMROOT: '/scratch1/NCEPDEV/global/glopara/com'
 COMINsyn: '${COMROOT}/gfs/prod/syndat'
 HOMEDIR: '/scratch1/BMC/gsd-fv3/NCEPDEV/global/${USER}'
-STMP: '/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite/FV3GFSrun/'
-PTMP: '/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite/FV3GFSrun/'
+STMP: '${HOMEgfs}/FV3GFSrun/'
+PTMP: '${HOMEgfs}/FV3GFSrun/'
 NOSCRUB: $HOMEDIR
 ACCOUNT: gsd-fv3
 SCHEDULER: slurm