diff --git a/deployments/icesat2/config/common.yaml b/deployments/icesat2/config/common.yaml
index b9dec6e3..c2c760e4 100644
--- a/deployments/icesat2/config/common.yaml
+++ b/deployments/icesat2/config/common.yaml
@@ -37,7 +37,6 @@ pangeo:
             environment: {'NVIDIA_DRIVER_CAPABILITIES': 'compute,utility'}
             tolerations: [{'key': 'nvidia.com/gpu','operator': 'Equal','value': 'present','effect': 'NoSchedule'}]
             extra_resource_limits: {"nvidia.com/gpu": "1"}
-      serviceAccountName: pangeo
       startTimeout: 600
       initContainers:
         - name: change-volume-mount-permissions
diff --git a/pangeo-deploy/values.yaml b/pangeo-deploy/values.yaml
index b538581a..62606943 100644
--- a/pangeo-deploy/values.yaml
+++ b/pangeo-deploy/values.yaml
@@ -30,6 +30,7 @@ pangeo:
         # The default worker image matches the singleuser image.
         DASK_GATEWAY__CLUSTER__OPTIONS__IMAGE: '{JUPYTER_IMAGE_SPEC}'
         DASK_GATEWAY__AUTH__TYPE: 'jupyterhub'
+      serviceAccountName: pangeo
 
     prePuller:
       hook:
@@ -45,6 +46,9 @@ pangeo:
   dask-gateway:
     gateway:
       backend:
+        scheduler:
+          extraPodConfig:
+            serviceAccountName: pangeo
         worker:
           extraContainerConfig:
             securityContext: