diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml
index 89836128..d9b1957e 100644
--- a/.github/workflows/ArduinoBuild.yml
+++ b/.github/workflows/ArduinoBuild.yml
@@ -47,14 +47,16 @@ jobs:
           #- { matrix-context: S3Box-Test, sdk-version: 2.0.0 }
           #- { matrix-context: S3Box-Test, sdk-version: 2.0.1 }
           #- { matrix-context: S3Box-Test sdk-version: 2.0.2 }
+          - { matrix-context: S3Box-Test, sdk-version: 2.0.4 } # will be fixed in 2.0.5 https://github.com/espressif/arduino-esp32/pull/6962/files
           - { matrix-context: M5Core2-test, sdk-version: 1.0.6 } # M5Core2.h suddenly ceased to support 1.0.6 (I2S and I2C broken)
 
+
         include:
 
           # buildable sdk versions
           - sdk-version: 1.0.6
-          - sdk-version: 2.0.0
-          - sdk-version: 2.0.1
+          #- sdk-version: 2.0.0
+          #- sdk-version: 2.0.1
           - sdk-version: 2.0.3
           - sdk-version: 2.0.4
 
diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml
index ae5724db..e951c622 100644
--- a/.github/workflows/PlatformioBuild.yml
+++ b/.github/workflows/PlatformioBuild.yml
@@ -49,6 +49,8 @@ jobs:
           - { piocontext: s3box, platform-version: 2.0.0 }
           - { piocontext: s3box, platform-version: 2.0.1 }
           #- { piocontext: s3box, platform-version: 2.0.2 }
+          - { piocontext: m5stack-core2, platform-version: 1.0.6 } # M5Core2.h broken I2S support with 1.0.6
+          - { piocontext: m5stack-core2, platform-version: 2.0.0 } # M5Core2.h broken I2S support with 2.0.0
 
         include:
           - piocontext: lgfx