diff --git a/.github/workflows/on-dispatch.yml b/.github/workflows/on-dispatch.yml
index afc3ce43c..f240f8ac0 100644
--- a/.github/workflows/on-dispatch.yml
+++ b/.github/workflows/on-dispatch.yml
@@ -19,7 +19,7 @@ jobs:
         run: yarn run build
         env:
           CMS_CRUD: ${{ secrets.CMS_CRUD }}
-          CONTENTFUL_SPACE: ${{ secrets.CONTENTFUL_SPACE }}
+          CONTENTFUL_SPACE: ${{ github.event.client_payload.spaceId }}
           CONTENTFUL_TOKEN: ${{ secrets.CONTENTFUL_TOKEN }}
           GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
           TAG_MANAGER_ID: ${{ secrets.TAG_MANAGER_ID }}
@@ -27,9 +27,9 @@ jobs:
           PLAUSIBLE_CUSTOM_DOMAIN: ${{ secrets.PLAUSIBLE_CUSTOM_DOMAIN }}
           GOOGLE_SITE_VERIFICATION_META_CONTENT: ${{ secrets.GOOGLE_SITE_VERIFICATION_META_CONTENT }}
           GATSBY_CONTACT_US_ENDPOINT_URI: ${{ secrets.CONTACT_US_ENDPOINT_URI }}
+          CONTENTFUL_ENVIRONMENT: ${{ github.event.client_payload.environment }}
+          CONTENTFUL_HOST: ${{ github.event.client_payload.host }}
           NODE_ENV: production
-      - name: Get branch
-        uses: rlespinasse/github-slug-action@v3.x
       - name: Deploy to Netlify
         id: deploy
         uses: nwtgck/actions-netlify@v2
@@ -44,7 +44,7 @@ jobs:
           enable-commit-comment: false
           enable-commit-status: false
           overwrites-pull-request-comment: true
-          github-deployment-environment: ${{ env.GITHUB_HEAD_REF_SLUG || env.GITHUB_REF_SLUG }}
+          github-deployment-environment: ${{ github.event.client_payload.environment }}
           fails-without-credentials: true
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 01a897711..7aec4e0d1 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -61,6 +61,7 @@ jobs:
           PLAUSIBLE_CUSTOM_DOMAIN: ${{ secrets.PLAUSIBLE_CUSTOM_DOMAIN }}
           GOOGLE_SITE_VERIFICATION_META_CONTENT: ${{ secrets.GOOGLE_SITE_VERIFICATION_META_CONTENT }}
           GATSBY_CONTACT_US_ENDPOINT_URI: ${{ secrets.CONTACT_US_ENDPOINT_URI }}
+          CONTENTFUL_ENVIRONMENT: master
           NODE_ENV: production
 
   ###############################################################################
@@ -141,6 +142,7 @@ jobs:
           CMS_CRUD: ${{ secrets.CMS_CRUD }}
           CONTENTFUL_SPACE: ${{ secrets.CONTENTFUL_SPACE }}
           CONTENTFUL_TOKEN: ${{ secrets.CONTENTFUL_TOKEN }}
+          CONTENTFUL_ENVIRONMENT: master
           NODE_ENV: test
 
   ###############################################################################
diff --git a/gatsby-config.js b/gatsby-config.js
index 3655feda0..04fe1a403 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -4,6 +4,8 @@ const path = require('path');
 const {
   CONTENTFUL_TOKEN,
   CONTENTFUL_SPACE,
+  CONTENTFUL_ENVIRONMENT = 'master',
+  CONTENTFUL_HOST,
   GA_TRACKING_ID,
   TAG_MANAGER_ID,
   GOOGLE_SITE_VERIFICATION_META_CONTENT,
@@ -205,7 +207,8 @@ const configs = {
     options: {
       spaceId: CONTENTFUL_SPACE,
       accessToken: CONTENTFUL_TOKEN,
-      environment: 'master',
+      environment: CONTENTFUL_ENVIRONMENT,
+      host: CONTENTFUL_HOST,
     },
   },
   'gatsby-source-lever': {