diff --git a/parm/config/sfs/config.base b/parm/config/sfs/config.base
index da85f5761f..b2fd136685 100644
--- a/parm/config/sfs/config.base
+++ b/parm/config/sfs/config.base
@@ -136,7 +136,7 @@ export DO_OCN="NO"
 export DO_ICE="NO"
 export DO_EXTRACTVARS="@DO_EXTRACTVARS@" # Option to process and extract a subset of products to save on disk
 export DO_AERO_FCST="NO"
-export DOBNDPNT_WAVE="NO" # The GEFS buoys file does not currently have any boundary points
+export DOBNDPNT_WAVE="NO" # The SFS buoys file does not currently have any boundary points
 export DOIBP_WAV="NO" # Option to create point outputs from input boundary points
 export FRAC_GRID=".true."
 export DO_NEST="NO" # Whether to run a global-nested domain
@@ -152,7 +152,7 @@ export OPS_RES="C768" # Do not change
 
 # Resolution specific parameters
 export LEVS=128
-export CASE="@CASECTL@"  # CASE is required in GEFS to determine ocean/ice/wave resolutions
+export CASE="@CASECTL@"  # CASE is required in SFS to determine ocean/ice/wave resolutions
 export CASE_ENS="@CASEENS@"
 export OCNRES="@OCNRES@"
 export ICERES="${OCNRES}"
diff --git a/workflow/applications/sfs.py b/workflow/applications/sfs.py
index 13f7a51cdf..76e180503f 100644
--- a/workflow/applications/sfs.py
+++ b/workflow/applications/sfs.py
@@ -91,8 +91,9 @@ def get_task_names(self):
             tasks += ['wavepostpnt']
 
         if options['do_extractvars']:
-            tasks += ['extractvars', 'arch']
+            tasks += ['extractvars']
 
+        # TODO: Add archive
         tasks += ['cleanup']
 
         return {f"{self.run}": tasks}
diff --git a/workflow/rocoto/sfs_tasks.py b/workflow/rocoto/sfs_tasks.py
index 4650fe6c89..ddfba2fabb 100644
--- a/workflow/rocoto/sfs_tasks.py
+++ b/workflow/rocoto/sfs_tasks.py
@@ -206,7 +206,7 @@ def _atmosoceaniceprod(self, component: str):
         max_tasks = self._configs[config]['MAX_TASKS']
         resources = self.get_resource(config)
 
-        fhrs = self._get_forecast_hours('gefs', self._configs[config], component)
+        fhrs = self._get_forecast_hours('sfs', self._configs[config], component)
 
         # when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs
         is_replay = self._configs[config]['REPLAY_ICS']
@@ -276,7 +276,7 @@ def atmos_ensstat(self):
 
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-        fhrs = self._get_forecast_hours('gefs', self._configs['atmos_ensstat'])
+        fhrs = self._get_forecast_hours('sfs', self._configs['atmos_ensstat'])
 
         # when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs
         is_replay = self._configs['atmos_ensstat']['REPLAY_ICS']
@@ -327,7 +327,7 @@ def wavepostsbs(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='or')
 
-        fhrs = self._get_forecast_hours('gefs', self._configs['wavepostsbs'], 'wave')
+        fhrs = self._get_forecast_hours('sfs', self._configs['wavepostsbs'], 'wave')
 
         # When using replay, output does not start until hour 3
         is_replay = self._configs['wavepostsbs']['REPLAY_ICS']
diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py
index c491f26800..dae0e162a2 100644
--- a/workflow/rocoto/tasks.py
+++ b/workflow/rocoto/tasks.py
@@ -167,7 +167,7 @@ def _get_forecast_hours(run, config, component='atmos') -> List[str]:
             fhmax = local_config['FHMAX']
             fhout = local_config['FHOUT']
             fhrs = list(range(fhmin, fhmax + fhout, fhout))
-        elif run in ['gfs', 'gefs']:
+        elif run in ['gfs', 'gefs', 'sfs']:
             fhmax = local_config['FHMAX_GFS']
             fhout = local_config['FHOUT_GFS']
             fhout_hf = local_config['FHOUT_HF_GFS']