diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini
index d2dce7836..8f938f847 100644
--- a/platformio_tasmota_core3_env_sample.ini
+++ b/platformio_tasmota_core3_env_sample.ini
@@ -45,6 +45,7 @@ board_build.f_cpu       = 240000000L
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
+                          -DUSE_MATTER_DEVICE
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
@@ -54,6 +55,7 @@ board                   = esp32s2
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
+                          -DUSE_MATTER_DEVICE
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
@@ -63,6 +65,7 @@ board                   = esp32s2cdc
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
+                          -DUSE_MATTER_DEVICE
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
@@ -74,6 +77,7 @@ board_build.f_flash     = 80000000L
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
+                          -DUSE_MATTER_DEVICE
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
@@ -85,6 +89,7 @@ board_build.f_flash     = 80000000L
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
+                          -DUSE_MATTER_DEVICE
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
@@ -94,8 +99,7 @@ board                   = esp32s3-qio_qspi
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
-                          -DUSE_MI_HOMEKIT=0    ; 1 to enable; 0 to disable
-                          -DUSE_MI_ESP32
+                          -DUSE_MATTER_DEVICE
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
@@ -134,8 +138,6 @@ build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
                           -DUSE_MATTER_DEVICE
-                          ;-DUSE_MI_HOMEKIT=0    ; 1 to enable; 0 to disable
-                          ;-DUSE_MI_ESP32
                           -fno-lto
                           -DOTA_URL='""'
 monitor_filters         = esp32_exception_decoder
@@ -149,8 +151,7 @@ build_unflags           = ${env:arduino30.build_unflags}
                           -mtarget-align
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
-                          -DUSE_MI_HOMEKIT=0    ; 1 to enable; 0 to disable
-                          -DUSE_MI_ESP32
+                          -DUSE_MATTER_DEVICE
                           -fno-lto
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
@@ -163,6 +164,7 @@ build_unflags           = ${env:arduino30.build_unflags}
                           -mtarget-align
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30
+                          -DUSE_MATTER_DEVICE
                           -fno-lto
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
@@ -195,6 +197,21 @@ build_flags             = ${env:arduino30.build_flags}
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
 
+[env:tasmota32c6cdc-mi32_ard3]
+extends                 = env:arduino30
+board                   = esp32c6cdc
+build_unflags           = ${env:arduino30.build_unflags}
+                          -flto
+                          -mtarget-align
+build_flags             = ${env:arduino30.build_flags}
+                          -fno-lto
+                          -DFIRMWARE_ARDUINO30
+                          -DUSE_MI_EXT_GUI
+                          -DUSE_MI_ESP32
+                          -DOTA_URL='""'
+monitor_filters         = esp32_exception_decoder
+lib_ignore              = ${env:arduino30.lib_ignore}
+
 [env:tasmota32c2-safeboot]
 extends                 = env:tasmota32c2-arduino30
 build_unflags           = ${env:tasmota32c2-arduino30.build_unflags}