diff --git a/.github/workflows/ci_unit_tests.yaml b/.github/workflows/ci_unit_tests.yaml
index e22f63bf56..6dbc7ee52c 100644
--- a/.github/workflows/ci_unit_tests.yaml
+++ b/.github/workflows/ci_unit_tests.yaml
@@ -47,7 +47,7 @@ jobs:
         run: |
           sudo mkdir -p /scratch1/NCEPDEV
           cd $GITHUB_WORKSPACE/sorc
-          git submodule update --init --recursive
+          git submodule update --init
           ./link_workflow.sh
           cd $GITHUB_WORKSPACE/ci/scripts/tests
           ln -s ../wxflow
diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
index b7021a6e3f..046dafcfa7 100644
--- a/workflow/hosts/awspw.yaml
+++ b/workflow/hosts/awspw.yaml
@@ -7,7 +7,6 @@ STMP: '/lustre/${USER}/stmp2/'
 PTMP: '/lustre/${USER}/stmp4/'
 NOSCRUB: ${HOMEDIR}
 ACCOUNT: hwufscpldcld
-ACCOUNT_SERVICE: hwufscpldcld
 SCHEDULER: slurm
 QUEUE: batch
 QUEUE_SERVICE: batch
diff --git a/workflow/hosts/container.yaml b/workflow/hosts/container.yaml
index 907f69754e..d7924724ae 100644
--- a/workflow/hosts/container.yaml
+++ b/workflow/hosts/container.yaml
@@ -8,7 +8,6 @@ PTMP: '/home/${USER}'
 NOSCRUB: $HOMEDIR
 SCHEDULER: none
 ACCOUNT: ''
-ACCOUNT_SERVICE: ''
 QUEUE: ''
 QUEUE_SERVICE: ''
 PARTITION_BATCH: ''
diff --git a/workflow/hosts/gaea.yaml b/workflow/hosts/gaea.yaml
index ff9877e77b..619a86f2e5 100644
--- a/workflow/hosts/gaea.yaml
+++ b/workflow/hosts/gaea.yaml
@@ -9,7 +9,6 @@ STMP: '/gpfs/f5/ufs-ard/scratch/${USER}'
 PTMP: '/gpfs/f5/ufs-ard/scratch/${USER}'
 NOSCRUB: $HOMEDIR
 ACCOUNT: ufs-ard
-ACCOUNT_SERVICE: ufs-ard
 SCHEDULER: slurm
 QUEUE: normal
 QUEUE_SERVICE: normal
diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
index 76a7158f43..731e583961 100644
--- a/workflow/hosts/hera.yaml
+++ b/workflow/hosts/hera.yaml
@@ -8,7 +8,6 @@ STMP: '/scratch1/NCEPDEV/stmp2/${USER}'
 PTMP: '/scratch1/NCEPDEV/stmp4/${USER}'
 NOSCRUB: $HOMEDIR
 ACCOUNT: fv3-cpu
-ACCOUNT_SERVICE: fv3-cpu
 SCHEDULER: slurm
 QUEUE: batch
 QUEUE_SERVICE: batch
diff --git a/workflow/hosts/hercules.yaml b/workflow/hosts/hercules.yaml
index 975558160f..b513bfd57a 100644
--- a/workflow/hosts/hercules.yaml
+++ b/workflow/hosts/hercules.yaml
@@ -9,7 +9,6 @@ PTMP: '/work/noaa/stmp/${USER}/HERCULES'
 NOSCRUB: $HOMEDIR
 SCHEDULER: slurm
 ACCOUNT: fv3-cpu
-ACCOUNT_SERVICE: fv3-cpu
 QUEUE: batch
 QUEUE_SERVICE: batch
 PARTITION_BATCH: hercules
diff --git a/workflow/hosts/jet.yaml b/workflow/hosts/jet.yaml
index b526e073c3..ae7267d687 100644
--- a/workflow/hosts/jet.yaml
+++ b/workflow/hosts/jet.yaml
@@ -8,7 +8,6 @@ STMP: '/lfs4/HFIP/hfv3gfs/${USER}/stmp'
 PTMP: '/lfs4/HFIP/hfv3gfs/${USER}/ptmp'
 NOSCRUB: $HOMEDIR
 ACCOUNT: hfv3gfs
-ACCOUNT_SERVICE: hfv3gfs
 SCHEDULER: slurm
 QUEUE: batch
 QUEUE_SERVICE: batch
diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml
index fe36c8e7ce..f0f807aacf 100644
--- a/workflow/hosts/orion.yaml
+++ b/workflow/hosts/orion.yaml
@@ -9,7 +9,6 @@ PTMP: '/work/noaa/stmp/${USER}/ORION'
 NOSCRUB: $HOMEDIR
 SCHEDULER: slurm
 ACCOUNT: fv3-cpu
-ACCOUNT_SERVICE: fv3-cpu
 QUEUE: batch
 QUEUE_SERVICE: batch
 PARTITION_BATCH: orion
diff --git a/workflow/hosts/s4.yaml b/workflow/hosts/s4.yaml
index 37479fa13c..aea807da63 100644
--- a/workflow/hosts/s4.yaml
+++ b/workflow/hosts/s4.yaml
@@ -8,7 +8,6 @@ STMP: '/scratch/users/${USER}'
 PTMP: '/scratch/users/${USER}'
 NOSCRUB: ${HOMEDIR}
 ACCOUNT: star
-ACCOUNT_SERVICE: star
 SCHEDULER: slurm
 QUEUE: s4
 QUEUE_SERVICE: serial
diff --git a/workflow/hosts/wcoss2.yaml b/workflow/hosts/wcoss2.yaml
index e3650e4710..7ae2be1424 100644
--- a/workflow/hosts/wcoss2.yaml
+++ b/workflow/hosts/wcoss2.yaml
@@ -8,7 +8,6 @@ STMP: '/lfs/h2/emc/stmp/${USER}'
 PTMP: '/lfs/h2/emc/ptmp/${USER}'
 NOSCRUB: $HOMEDIR
 ACCOUNT: 'GFS-DEV'
-ACCOUNT_SERVICE: 'GFS-DEV'
 SCHEDULER: pbspro
 QUEUE: 'dev'
 QUEUE_SERVICE: 'dev_transfer'
diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py
index 097d1adef5..404203f02d 100644
--- a/workflow/rocoto/tasks.py
+++ b/workflow/rocoto/tasks.py
@@ -176,7 +176,7 @@ def get_resource(self, task_name):
 
         task_config = self._configs[task_name]
 
-        account = task_config['ACCOUNT_SERVICE'] if task_name in Tasks.SERVICE_TASKS else task_config['ACCOUNT']
+        account = task_config['ACCOUNT']
 
         if f'wtime_{task_name}_{self.cdump}' in task_config:
             walltime = task_config[f'wtime_{task_name}_{self.cdump}']