diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc227aa..4838c18 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,12 +43,14 @@ jobs:
       run: echo "PLATFORMIO_BUILD_FLAGS=-DVERSION='\"${GITHUB_REF#refs/*/}\"'" >> $GITHUB_ENV
       if: startsWith(github.ref, 'refs/tags/v')
     - name: Run PlatformIO
-      run: pio run -e esp32 -e esp32c3 -e esp32s3 -e esp32-verbose -e esp32c3-verbose -e esp32s3-verbose -e m5stickc -e m5stickc-plus -e m5atom -e macchina-a0
+      run: pio run -e esp32 -e esp32c3 -e esp32c3-cdc -e esp32s3 -e esp32s3-cdc -e esp32-verbose -e esp32c3-verbose -e esp32s3-verbose -e m5stickc -e m5stickc-plus -e m5atom -e macchina-a0
     - name: Rename firmware
       run: |
         cp .pio/build/esp32/firmware.bin esp32.bin
         cp .pio/build/esp32c3/firmware.bin esp32c3.bin
+        cp .pio/build/esp32c3-cdc/firmware.bin esp32c3-cdc.bin
         cp .pio/build/esp32s3/firmware.bin esp32s3.bin
+        cp .pio/build/esp32s3-cdc/firmware.bin esp32s3-cdc.bin
         cp .pio/build/esp32-verbose/firmware.bin esp32-verbose.bin
         cp .pio/build/esp32c3-verbose/firmware.bin esp32c3-verbose.bin
         cp .pio/build/esp32s3-verbose/firmware.bin esp32s3-verbose.bin
diff --git a/platformio.ini b/platformio.ini
index 8aa0cab..cfca4e3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -79,21 +79,33 @@ build_flags =
   -D ESP32C3
   ${common.build_flags}
 
+[esp32c3-cdc]
+extends = esp32c3
+build_flags =
+  -D ARDUINO_USB_MODE=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  ${esp32c3.build_flags}
+
 [esp32s3]
 extends = common
-platform = espressif32@6.1.0
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.05.01/platform-espressif32.zip
 board = dfrobot_firebeetle2_esp32s3
 build_flags =
   -D ARDUINO_ARCH_ESP32
   -D ARDUINO_ARCH_ESP32S3
   -D CONFIG_IDF_TARGET_ESP32S3
   -D ARDUINO_USB_MODE=1
-  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
   -D REPORT_PINNED_TO_CORE=1
   -D ESP32S3
   ${common.build_flags}
 
+[esp32s3-cdc]
+extends = esp32s3
+build_flags =
+  -D ARDUINO_USB_MODE=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  ${esp32s3.build_flags}
+
 [sensors]
 lib_deps =
   adafruit/Adafruit Unified Sensor@^1.1.4
@@ -131,6 +143,16 @@ build_flags =
   -D SENSORS
   ${esp32c3.build_flags}
 
+[env:esp32c3-cdc]
+extends = esp32c3-cdc
+lib_deps =
+  ${esp32c3.lib_deps}
+  ${sensors.lib_deps}
+build_flags =
+  -D FIRMWARE='"esp32c3-cdc"'
+  -D SENSORS
+  ${esp32c3-cdc.build_flags}
+
 [env:esp32s3]
 extends = esp32s3
 lib_deps =
@@ -141,6 +163,16 @@ build_flags =
   -D SENSORS
   ${esp32s3.build_flags}
 
+[env:esp32s3-cdc]
+extends = esp32s3-cdc
+lib_deps =
+  ${esp32s3.lib_deps}
+  ${sensors.lib_deps}
+build_flags =
+  -D FIRMWARE='"esp32s3-cdc"'
+  -D SENSORS
+  ${esp32s3-cdc.build_flags}
+
 [env:esp32-verbose]
 extends = esp32
 lib_deps =