diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml
index 1333816530f..555f705abbd 100644
--- a/.github/workflows/cd-deploy-nodes-gcp.yml
+++ b/.github/workflows/cd-deploy-nodes-gcp.yml
@@ -157,6 +157,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
 
@@ -236,6 +237,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 4470d244029..31dcdc85ffe 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.1
         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.1
         with:
diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml
index 05872f2532d..a619061f5de 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 11b6399d625..0c72ef2078e 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 3ff5ab1e79a..d5885bc99b5 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 7266f60ea54..0c62b063aab 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 a71237887e2..31c1240ddb8 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