diff --git a/platformio.ini b/platformio.ini
index 6182f6328..053db1a2b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -154,16 +154,10 @@ build_flags =
   -DBOARD_C3_MINI_V1
 
 ; XIAO ESP32C - 512KB SRAM & 4MB Flash - https://wiki.seeedstudio.com/xiao_esp32c6_getting_started/
-[env:c6]
-framework = arduino
-board_build.partitions = partitions/esp32_partition_4M.csv
-board_upload.flash_size = 4MB
+[env:c6_xiao_4M]
+extends = espressif32_base_4M
 board_build.app_partition_name = app0
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip ; Arduino Release v3.3.0 based on ESP-IDF v5.5.0 
 board = seeed_xiao_esp32c6
-build_flags =
-  ${common.build_flags}
-  -DBOARD_C6
 
 ; foundation for building and testing natively, standalone without an ESP32
 ; use the `standalone` environment instead of `native` for testing