diff --git a/SFS_baseline-c96/SFS_options.yaml b/SFS_baseline-c96/SFS_options.yaml
index 28bcd5c536..897eaff8b4 100644
--- a/SFS_baseline-c96/SFS_options.yaml
+++ b/SFS_baseline-c96/SFS_options.yaml
@@ -10,11 +10,11 @@ base:
   DO_RESTART: "NO"
   KEEPDATA: "YES"
   DO_EXTRACTVARS: "NO"
-  FHMAX: 744
-  FHMIN: 264
-  FHMAX_GFS: 744
-  FHMIN_GFS: 264
-  FHMAX_HF_GFS: 744
+  FHMIN: 768
+  FHMIN_GFS: 768
+  FHMAX: 1464
+  FHMAX_GFS: 1464
+  FHMAX_HF_GFS: 1464
   FHOUT: 24
   FHOUT_HF: 24
   FHOUT_GFS: 24
@@ -23,6 +23,8 @@ base:
   FHOUT_ICE_GFS: 24
   FCST_BREAKPOINTS: ""
   REPLAY_ICS: "NO"
+  RERUN: "YES"
+  RERUN_DATE: "1994060100"
   HPSSARCH: "NO"
   LOCALARCH: "NO"
   FLTFILEGFS: "postxconfig-NT-SFS.txt"
diff --git a/SFS_baseline-c96/SFS_options.yaml.template b/SFS_baseline-c96/SFS_options.yaml.template
new file mode 100644
index 0000000000..ac546c5847
--- /dev/null
+++ b/SFS_baseline-c96/SFS_options.yaml.template
@@ -0,0 +1,44 @@
+base:
+  DO_JEDIATMVAR: "NO"
+  DO_JEDIATMENS: "NO"
+  DO_JEDIOCNVAR: "NO"
+  DO_JEDISNOWDA: "NO"
+  DO_MERGENSST: "NO"
+  DO_BUFRSND: "NO"
+  DO_GEMPAK: "NO"
+  DO_AWIPS: "NO"
+  DO_RESTART: "NO"
+  KEEPDATA: "YES"
+  DO_EXTRACTVARS: "NO"
+  FHMIN: FCSTMINHOUR
+  FHMIN_GFS: FCSTMINHOUR
+  FHMAX: FCSTMAXHOUR
+  FHMAX_GFS: FCSTMAXHOUR
+  FHMAX_HF_GFS: FCSTMAXHOUR
+  FHOUT: 24
+  FHOUT_HF: 24
+  FHOUT_GFS: 24
+  FHOUT_HF_GFS: 24
+  FHOUT_OCN_GFS: 24
+  FHOUT_ICE_GFS: 24
+  FCST_BREAKPOINTS: ""
+  REPLAY_ICS: "NO"
+  RERUN: "YES"
+  RERUN_DATE: "RERUNYYYYMMDDHH"
+  HPSSARCH: "NO"
+  LOCALARCH: "NO"
+  FLTFILEGFS: "postxconfig-NT-SFS.txt"
+  FLTFILEGFSF00: "postxconfig-NT-SFS.txt"
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
+  BASE_IC: /bucket/Wei.Huang/SFS-REPLAY_ICs/C96mx100
+fcst:
+  TYPE: "hydro"
+  MONO: "mono"
+  reforecast: "YES"
+  FHZER: 12
+  POST_SFS: "YES"
+stage_ic:
+  USE_OCN_ENS_PERTURB_FILES: "NO"
+  USE_ATM_ENS_PERTURB_FILES: "NO"
+ocn:
+  MOM6_INTERP_ICS: "NO"
diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources
index dc0a1f02bb..40019bb3fc 100644
--- a/parm/config/gefs/config.resources
+++ b/parm/config/gefs/config.resources
@@ -305,6 +305,14 @@ case ${step} in
     export threads_per_task=1
     export memory="4096M"
     ;;
+
+  "archive2bucket")
+    export walltime="00:45:00"
+    export ntasks=1
+    export tasks_per_node=1
+    export threads_per_task=1
+    ;;
+
   *)
     echo "FATAL ERROR: Invalid job ${step} passed to ${BASH_SOURCE[0]}"
     exit 1
diff --git a/scripts/exglobal_cleanup.sh b/scripts/exglobal_cleanup.sh
index 73637a0d55..d7d6a56533 100755
--- a/scripts/exglobal_cleanup.sh
+++ b/scripts/exglobal_cleanup.sh
@@ -7,15 +7,15 @@ echo "Begin Cleanup ${DATAROOT}!"
 
 # Remove DATAoutput from the forecast model run
 # TODO: Handle this better
-DATAfcst="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}"
-if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
+#DATAfcst="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}"
+#if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
 #DATAefcs="${DATAROOT}/${RUN}efcs???${PDY:-}${cyc}"
-rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"
+#rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"
 ###############################################################
 
-if [[ "${CLEANUP_COM:-YES}" == NO ]] ; then
+#if [[ "${CLEANUP_COM:-YES}" == NO ]] ; then
     exit 0
-fi
+#fi
 
 ###############################################################
 # Clean up previous cycles; various depths