diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8faef14e5b..649bc06be6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -125,7 +125,16 @@ jobs:
           slot-name: "staging"
 
       - name: Start staging slot
-        run: az webapp start -n ${{ steps.retrieve-secrets.outputs.webapp-name }} -g bitwarden -s staging
+        env:
+          SERVICE: ${{ matrix.name }}
+          WEBAPP_NAME: ${{ steps.retrieve-secrets.outputs.webapp-name }}
+        run: |
+          if [[ "$SERVICE" = "Api" ]] || [[ "$SERVICE" = "Identity" ]]; then
+            RESOURCE_GROUP=bitwardenappservices
+          else
+            RESOURCE_GROUP=bitwarden
+          fi
+          az webapp start -n $WEBAPP_NAME -g $RESOURCE_GROUP -s staging
 
 
   release-docker:
diff --git a/.github/workflows/stop-staging-slots.yml b/.github/workflows/stop-staging-slots.yml
index 969c779a7b..2774612667 100644
--- a/.github/workflows/stop-staging-slots.yml
+++ b/.github/workflows/stop-staging-slots.yml
@@ -48,4 +48,13 @@ jobs:
           echo "::set-output name=webapp-name::$webapp_name"
 
       - name: Stop staging slot
-        run: az webapp stop -n ${{ steps.retrieve-secrets.outputs.webapp-name }} -g bitwarden -s staging
+        env:
+          SERVICE: ${{ matrix.name }}
+          WEBAPP_NAME: ${{ steps.retrieve-secrets.outputs.webapp-name }}
+        run: |
+          if [[ "$SERVICE" = "Api" ]] || [[ "$SERVICE" = "Identity" ]]; then
+            RESOURCE_GROUP=bitwardenappservices
+          else
+            RESOURCE_GROUP=bitwarden
+          fi
+          az webapp stop -n $WEBAPP_NAME -g $RESOURCE_GROUP -s staging