diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini
index 085e8f889038..889eaf8d2359 100644
--- a/platformio_tasmota_core3_env_sample.ini
+++ b/platformio_tasmota_core3_env_sample.ini
@@ -29,7 +29,7 @@ build_flags             = ${core32.build_flags}
 
 [core32_30_flags]
 build_unflags           = ${core32_30.build_unflags}
-                          -DUSE_IPV6
+                          ;-DUSE_IPV6
 build_flags             = ${core32_30.build_flags}
 lib_extra_dirs          = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_audio, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl
 lib_ignore              =
@@ -71,8 +71,7 @@ board                   = esp32
 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}
 
@@ -82,8 +81,7 @@ board                   = esp32_solo1
 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}
 
@@ -161,8 +159,9 @@ 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
+                          ;-DUSE_MI_HOMEKIT=0    ; 1 to enable; 0 to disable
+                          ;-DUSE_MI_ESP32
                           -fno-lto
                           -DOTA_URL='""'
 monitor_filters         = esp32_exception_decoder
@@ -203,8 +202,7 @@ build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -fno-lto
                           -DFIRMWARE_ARDUINO30
-                          -DUSE_MI_HOMEKIT=0    ; 1 to enable; 0 to disable
-                          -DUSE_MI_ESP32
+                          -DUSE_MATTER_DEVICE
                           -DOTA_URL='""'
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
@@ -218,8 +216,7 @@ build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -fno-lto
                           -DFIRMWARE_ARDUINO30
-                          -DUSE_MI_HOMEKIT=0    ; 1 to enable; 0 to disable
-                          -DUSE_MI_ESP32
+                          -DUSE_MATTER_DEVICE
                           -DOTA_URL='""'
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}