diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml
index 2da3ac0e..2a9d0648 100755
--- a/.github/workflows/bump-date.yml
+++ b/.github/workflows/bump-date.yml
@@ -18,10 +18,10 @@ jobs:
 
     steps:
 
-    - name: Check out bugfix-2.0.x
-      uses: actions/checkout@v2
+    - name: Check out master
+      uses: actions/checkout@master
       with:
-        ref: bugfix-2.0.x
+        ref: master
 
     - name: Bump Distribution Date
       run: |
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index e5077b72..670bc41a 100755
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -30,6 +30,49 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+       matrix:
+         platform:
+         # Knutwurst Base Environments
+
+         - i3_MEGA_1stgen
+         - i3_MEGA_1stgen_TMC
+         - i3_MEGA_1stgen_BLTOUCH_10
+         - i3_MEGA_1stgen_BLTOUCH_11
+         - i3_MEGA_1stgen_TMC_BLTOUCH_10
+         - i3_MEGA_1stgen_TMC_BLTOUCH_11
+         - i3_MEGA
+         - i3_MEGA_TMC
+         - i3_MEGA_BLTOUCH_10
+         - i3_MEGA_BLTOUCH_11
+         - i3_MEGA_TMC_BLTOUCH_10
+         - i3_MEGA_TMC_BLTOUCH_11
+         - i3_MEGA_S
+         - i3_MEGA_S_TMC
+         - i3_MEGA_S_BLTOUCH_10
+         - i3_MEGA_S_BLTOUCH_11
+         - i3_MEGA_S_TMC_BLTOUCH_10
+         - i3_MEGA_S_TMC_BLTOUCH_11
+         - i3_MEGA_S_DGUS
+         - i3_MEGA_S_DGUS_TMC
+         - i3_MEGA_S_DGUS_BLTOUCH_10
+         - i3_MEGA_S_DGUS_BLTOUCH_11
+         - i3_MEGA_S_DGUS_TMC_BLTOUCH_10
+         - i3_MEGA_S_DGUS_TMC_BLTOUCH_11
+         - i3_MEGA_X
+         - i3_MEGA_X_TMC
+         - i3_MEGA_X_BLTOUCH_10
+         - i3_MEGA_X_BLTOUCH_11
+         - i3_MEGA_X_TMC_BLTOUCH_10
+         - i3_MEGA_X_TMC_BLTOUCH_11
+         - i3_MEGA_P
+         - i3_MEGA_P_TMC
+         - i3_MEGA_P_BLTOUCH_10
+         - i3_MEGA_P_BLTOUCH_11
+         - i3_MEGA_P_TMC_BLTOUCH_10
+         - i3_MEGA_P_TMC_BLTOUCH_11
+
+
     steps:
 
     - name: Select Python 3.7
@@ -51,4 +94,5 @@ jobs:
     - uses: actions/checkout@master
 
     - name: Run PlatformIO
-      run: platformio run
\ No newline at end of file
+      run: platformio run --environment ${{ matrix.platform }}
+      
\ No newline at end of file