diff --git a/.github/workflows/crons.yml b/.github/workflows/crons.yml
index fe9bc8aafe..8b850af72c 100644
--- a/.github/workflows/crons.yml
+++ b/.github/workflows/crons.yml
@@ -6,7 +6,7 @@ on:
 # when do a deploy so they don't fail erroneously, but these
 # cannot cancel deploys
 concurrency:
-  group: e2e
+  group: e2e-tools
   cancel-in-progress: false
 
 jobs:
diff --git a/.github/workflows/deploy-on-main.yml b/.github/workflows/deploy-on-main.yml
index 4ea5b01af0..ba8567b788 100644
--- a/.github/workflows/deploy-on-main.yml
+++ b/.github/workflows/deploy-on-main.yml
@@ -3,12 +3,6 @@ on:
     branches:
       - main
 
-# We want to ensure that in-progress cron runs are canceled
-# when do a deploy so they don't fail erroneously
-concurrency:
-  group: e2e
-  cancel-in-progress: true
-
 jobs:
   deploy-tools-prod:
     uses: ./.github/workflows/deploy-stack.yml
@@ -17,10 +11,3 @@ jobs:
       service: all
       version: stable
     secrets: inherit
-
-  e2e-validation:
-    needs: deploy-tools-prod
-    uses: ./.github/workflows/e2e-validation.yml
-    with:
-      environment: tools
-    secrets: inherit
diff --git a/.github/workflows/deploy-stack.yml b/.github/workflows/deploy-stack.yml
index 2cbc12fd7a..96e332dc0f 100644
--- a/.github/workflows/deploy-stack.yml
+++ b/.github/workflows/deploy-stack.yml
@@ -7,15 +7,12 @@ on:
     inputs:
       environment:
         type: string
-        required: true
         default: "tools"
       service:
         type: string
-        required: true
         default: "all"
       version:
         type: string
-        required: true
         default: "stable"
   workflow_dispatch:
     inputs:
@@ -51,23 +48,33 @@ jobs:
       environment: shared
     secrets: inherit
 
-  deploy-service:
-    needs: invalidate-cache
-    if: ${{ inputs.service != 'all' }}
-    uses: ./.github/workflows/deploy-service.yml
+  set-init:
+    uses: ./.github/workflows/set-init-version.yml
     with:
       environment: ${{ inputs.environment }}
       service: ${{ inputs.service }}
       version: ${{ inputs.version }}
     secrets: inherit
 
+  define-deployment-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      services: $
+    steps:
+      - id: services
+        run: |
+          if "${{ inputs.service }}" == 'all'; then
+            echo 'services=["pinga", "rebaser", "sdf", "veritech", "web"]' >> "$GITHUB_OUTPUT"
+          else
+            echo 'services=["${{ inputs.service }}"]' >> "$GITHUB_OUTPUT"
+          fi
+
   deploy-services:
-    needs: invalidate-cache
-    if: ${{ inputs.service == 'all' }}
+    needs: ["invalidate-cache", "define-deployment-matrix"]
     strategy:
      fail-fast: false
      matrix:
-      service: ["pinga", "rebaser", "sdf", "veritech", "web"]
+      service: ${{ fromJSON(needs.define-deployment-matrix.outputs.services) }}
     uses: ./.github/workflows/deploy-service.yml
     with:
       environment: ${{ inputs.environment }}
@@ -75,11 +82,14 @@ jobs:
       version: ${{ inputs.version }}
     secrets: inherit
 
-  set-init:
-    needs: invalidate-cache
-    uses: ./.github/workflows/set-init-version.yml
+  e2e-validation:
+    # We want to ensure that in-progress cron runs against tools-prod
+    # are canceled when we do a deploy so they don't fail erroneously
+    concurrency:
+      group: e2e-${{ inputs.environment }}
+      cancel-in-progress: true
+    needs: deploy-services
+    uses: ./.github/workflows/e2e-validation.yml
     with:
       environment: ${{ inputs.environment }}
-      service: ${{ inputs.service }}
-      version: ${{ inputs.version }}
     secrets: inherit