diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
index 9808b96579e..cec9748d89f 100644
--- a/parm/config/gefs/config.base
+++ b/parm/config/gefs/config.base
@@ -78,7 +78,7 @@ export NCP="/bin/cp -p"
 export NMV="/bin/mv"
 export NLN="/bin/ln -sf"
 export VERBOSE="YES"
-export KEEPDATA="@KEEPDATA@"
+export KEEPDATA="YES"
 export DEBUG_POSTSCRIPT="NO" # PBS only; sets debug=true
 export CHGRP_RSTPROD="@CHGRP_RSTPROD@"
 export CHGRP_CMD="@CHGRP_CMD@"
diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
index 9fd66bf0c72..926efefe13c 100644
--- a/parm/config/gfs/config.base
+++ b/parm/config/gfs/config.base
@@ -104,7 +104,7 @@ export NCP="/bin/cp -p"
 export NMV="/bin/mv"
 export NLN="/bin/ln -sf"
 export VERBOSE="YES"
-export KEEPDATA="NO"
+export KEEPDATA="YES"
 export DEBUG_POSTSCRIPT="NO" # PBS only; sets debug=true
 export CHGRP_RSTPROD="@CHGRP_RSTPROD@"
 export CHGRP_CMD="@CHGRP_CMD@"
diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
index 76a7158f433..27051205440 100644
--- a/workflow/hosts/hera.yaml
+++ b/workflow/hosts/hera.yaml
@@ -4,8 +4,8 @@ BASE_CPLIC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR/prototype_ICs'
 PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara'
 COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat'
 HOMEDIR: '/scratch1/NCEPDEV/global/${USER}'
-STMP: '/scratch1/NCEPDEV/stmp2/${USER}'
-PTMP: '/scratch1/NCEPDEV/stmp4/${USER}'
+STMP: '/scratch2/NCEPDEV/stmp/${USER}/global/CI/STMP'
+PTMP: '/scratch2/NCEPDEV/stmp/${USER}/global/CI/PTMP'
 NOSCRUB: $HOMEDIR
 ACCOUNT: fv3-cpu
 ACCOUNT_SERVICE: fv3-cpu