diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml
index 6eb3f10e9d6..41e55620418 100644
--- a/.github/workflows/cd-deploy-nodes-gcp.yml
+++ b/.github/workflows/cd-deploy-nodes-gcp.yml
@@ -174,6 +174,7 @@ jobs:
       image_name: zebrad
       no_cache: ${{ inputs.no_cache || false }}
       rust_log: info
+      environment: ${{ github.event_name == 'release' && 'prod' || 'dev' }}
     # This step needs access to Docker Hub secrets to run successfully
     secrets: inherit
 
@@ -239,6 +240,7 @@ jobs:
     timeout-minutes: 60
     env:
       CACHED_DISK_NAME: ${{ needs.get-disk-name.outputs.cached_disk_name }}
+    environment: ${{ github.event_name == 'release' && 'prod' || 'dev' }}
     permissions:
       contents: 'read'
       id-token: 'write'
diff --git a/.github/workflows/chore-delete-gcp-resources.yml b/.github/workflows/chore-delete-gcp-resources.yml
index b4e9eda2f64..fe0c42de7c6 100644
--- a/.github/workflows/chore-delete-gcp-resources.yml
+++ b/.github/workflows/chore-delete-gcp-resources.yml
@@ -38,6 +38,10 @@ jobs:
     permissions:
       contents: 'read'
       id-token: 'write'
+    strategy:
+      matrix:
+        environment: [dev, prod]
+    environment: ${{ matrix.environment }}
     steps:
       - uses: actions/checkout@v4.2.2
         with:
@@ -105,6 +109,10 @@ jobs:
     permissions:
       contents: 'read'
       id-token: 'write'
+    strategy:
+      matrix:
+        environment: [dev, prod]
+    environment: ${{ matrix.environment }}
     steps:
       - uses: actions/checkout@v4.2.2
         with:
diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml
index 8fc5951d142..507dc0c57f2 100644
--- a/.github/workflows/manual-zcashd-deploy.yml
+++ b/.github/workflows/manual-zcashd-deploy.yml
@@ -10,6 +10,9 @@ name: Zcashd Manual Deploy
 on:
   workflow_dispatch:
     inputs:
+      environment:
+        required: false
+        default: dev
       network:
         default: 'Mainnet'
         description: 'Network to deploy: Mainnet or Testnet'
diff --git a/.github/workflows/sub-build-docker-image.yml b/.github/workflows/sub-build-docker-image.yml
index ac6d5bbbecc..bd7a492ec29 100644
--- a/.github/workflows/sub-build-docker-image.yml
+++ b/.github/workflows/sub-build-docker-image.yml
@@ -10,6 +10,11 @@ name: Build docker image
 on:
   workflow_call:
     inputs:
+      environment:
+        description: 'The infra environment to build the image for'
+        required: false
+        default: dev
+        type: string
       image_name:
         required: true
         type: string
@@ -77,6 +82,8 @@ jobs:
       contents: 'read'
       id-token: 'write'
       pull-requests: write # for `docker-scout` to be able to write the comment
+    environment:
+      name: ${{ inputs.environment }}
     env:
       DOCKER_BUILD_SUMMARY: ${{ vars.DOCKER_BUILD_SUMMARY }}
     steps:
diff --git a/.github/workflows/sub-ci-integration-tests-gcp.yml b/.github/workflows/sub-ci-integration-tests-gcp.yml
index d4e4bd506d4..65d751ed7eb 100644
--- a/.github/workflows/sub-ci-integration-tests-gcp.yml
+++ b/.github/workflows/sub-ci-integration-tests-gcp.yml
@@ -8,6 +8,9 @@ name: Integration Tests on GCP
 on:
   workflow_call:
     inputs:
+      environment:
+        required: true
+        type: string
       network:
         default: "Mainnet"
         type: string
diff --git a/.github/workflows/sub-deploy-integration-tests-gcp.yml b/.github/workflows/sub-deploy-integration-tests-gcp.yml
index 05b2c42019f..182f22573d3 100644
--- a/.github/workflows/sub-deploy-integration-tests-gcp.yml
+++ b/.github/workflows/sub-deploy-integration-tests-gcp.yml
@@ -3,6 +3,10 @@ name: Deploy Tests to GCP
 on:
   workflow_call:
     inputs:
+      environment:
+        required: false
+        default: dev
+        type: string
       # Status and logging
       test_id:
         required: true
diff --git a/.github/workflows/sub-find-cached-disks.yml b/.github/workflows/sub-find-cached-disks.yml
index 9c2ee919d32..f32801ce91e 100644
--- a/.github/workflows/sub-find-cached-disks.yml
+++ b/.github/workflows/sub-find-cached-disks.yml
@@ -10,6 +10,10 @@ name: Check if cached state disks exist
 on:
   workflow_call:
     inputs:
+      environment:
+        required: false
+        default: dev
+        type: string
       network:
         description: 'The Zcash network used to look up the disks'
         required: true