diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index e8275543f..ebbc22d32 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -99,8 +99,8 @@ jobs:
           - tasmota32c2-safeboot
           - tasmota32c3cdc-safeboot
           - tasmota32s2-safeboot
+          - tasmota32s2cdc-safeboot
           - tasmota32s3cdc-safeboot
-          - tasmota32c2-safeboot
           - tasmota32c6cdc-safeboot
     steps:
       - uses: actions/checkout@v4
@@ -192,7 +192,6 @@ jobs:
           - tasmota32c6cdc
           - tasmota32s2
           - tasmota32s2cdc
-          - tasmota32s3
           - tasmota32s3cdc
           - tasmota32solo1
     steps:
diff --git a/tasmota/include/tasmota_configurations_ESP32.h b/tasmota/include/tasmota_configurations_ESP32.h
index 0a53feaf4..ae1506706 100644
--- a/tasmota/include/tasmota_configurations_ESP32.h
+++ b/tasmota/include/tasmota_configurations_ESP32.h
@@ -186,10 +186,12 @@
 #define USE_WEBSERVER
 #define USE_WEBCLIENT
 #define USE_WEBCLIENT_HTTPS
-#if CONFIG_IDF_TARGET_ESP32
-  #define USE_SERIAL_BRIDGE                        // Add support for software Serial Bridge console Tee (+2k code)
-  #define USE_ETHERNET
-#endif  // CONFIG_IDF_TARGET_ESP32
+
+// FIX ME Safeboot for ESP32 and ESP32solo1 to big with Core 3.0.0
+//#if CONFIG_IDF_TARGET_ESP32
+//  #define USE_SERIAL_BRIDGE                        // Add support for software Serial Bridge console Tee (+2k code)
+//  #define USE_ETHERNET
+//#endif  // CONFIG_IDF_TARGET_ESP32
 
 #endif  // FIRMWARE_SAFEBOOT