diff --git a/.github/actions/godot-cache/action.yml b/.github/actions/godot-cache/action.yml
index db14a0b97..3ec1b5e3a 100644
--- a/.github/actions/godot-cache/action.yml
+++ b/.github/actions/godot-cache/action.yml
@@ -15,8 +15,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: ${{inputs.scons-cache}}
-        key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+        key: ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
         restore-keys: |
-          ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-          ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-          ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}
+          ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}
+          ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 620d4d7b0..345ff78a2 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 # disable werrors for now
 # werror=yes 
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
index 076a70911..33c9b2cf8 100644
--- a/.github/workflows/ios_builds.yml
+++ b/.github/workflows/ios_builds.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 # disable werrors for now
 # werror=yes 
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml
index dfc9b9ab1..56b36d587 100644
--- a/.github/workflows/javascript_builds.yml
+++ b/.github/workflows/javascript_builds.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 # disable werrors for now
 # werror=yes 
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
   EM_VERSION: 2.0.25
   EM_CACHE_FOLDER: "emsdk-cache"
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 1d1804ca7..69db1c001 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 # Global Settings
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all werror=yes
 
 concurrency:
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
index 3f48ff514..d1b57e856 100644
--- a/.github/workflows/macos_builds.yml
+++ b/.github/workflows/macos_builds.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 # disable werrors for now
 # werror=yes 
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/server_builds.yml b/.github/workflows/server_builds.yml
index cb65da819..348a259c7 100644
--- a/.github/workflows/server_builds.yml
+++ b/.github/workflows/server_builds.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 # Global Settings
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 803b2809c..071f75d57 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_BASE_BRANCH: 3.x
+  PANDEMONIUM_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
   SCONS_CACHE_MSVC_CONFIG: true