diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index 1d7d24852..be75ce913 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -157,6 +157,11 @@ jobs:
       matrix:
         variant:
           - tasmota32
+          - tasmota32-matter
+          - tasmota32c3-matter
+          - tasmota32s3-matter
+          - tasmota32c3cdc-matter
+          - tasmota32s3cdc-matter
           - tasmota32-zbbrdgpro
           - tasmota32-webcam
           - tasmota32-bluetooth
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 7f46ee44b..71ee36db0 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -156,6 +156,11 @@ jobs:
       matrix:
         variant:
           - tasmota32
+          - tasmota32-matter
+          - tasmota32c3-matter
+          - tasmota32s3-matter
+          - tasmota32c3cdc-matter
+          - tasmota32s3cdc-matter
           - tasmota32-zbbrdgpro
           - tasmota32-webcam
           - tasmota32-bluetooth
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
index 3f89214e3..9f68b4b30 100644
--- a/.github/workflows/build_all_the_things.yml
+++ b/.github/workflows/build_all_the_things.yml
@@ -93,6 +93,9 @@ jobs:
           - tasmota32c3
           - tasmota32s2
           - tasmota32s3
+          - tasmota32-matter
+          - tasmota32c3-matter
+          - tasmota32s3-matter
           - tasmota32-zbbrdgpro
           - tasmota-zigbee
           - tasmota32-bluetooth
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 337255131..8db151d42 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -161,6 +161,69 @@ build_flags             = ${env:tasmota32_base.build_flags}
                           -DFRAMEWORK_ARDUINO_ITEAD
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin"'
 
+[env:tasmota32-matter]
+extends                 = env:tasmota32_base
+board_build.f_flash     = 80000000L
+board_build.f_cpu       = 240000000L
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -DFIRMWARE_TASMOTA32
+                          -DUSE_MATTER_DEVICE
+                          -DCODE_IMAGE_STR='"matter"'
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-matter.bin"'
+
+[env:tasmota32c3-matter]
+extends                 = env:tasmota32c3
+board                   = esp32c3
+board_build.flash_mode  = qio
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -fno-lto
+                          -DFIRMWARE_TASMOTA32
+                          -DUSE_MATTER_DEVICE
+                          -DCODE_IMAGE_STR='"matter"'
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3-matter.bin"'
+
+[env:tasmota32s3-matter]
+extends                 = env:tasmota32_base
+board_build.f_flash     = 80000000L
+board_build.f_cpu       = 240000000L
+board_build.flash_mode  = qio
+board                   = esp32s3-qio_qspi
+build_flags             = ${env:tasmota32_base.build_flags}
+                         -DFIRMWARE_TASMOTA32
+                         -DUSE_MATTER_DEVICE
+                         -DCODE_IMAGE_STR='"matter"'
+                         -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-matter.bin"'
+lib_ignore              =
+                          TTGO TWatch Library
+                          Micro-RTSP
+                          epdiy
+
+[env:tasmota32c3cdc-matter]
+extends                 = env:tasmota32c3
+board                   = esp32c3cdc
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -fno-lto
+                          -DFIRMWARE_TASMOTA32
+                          -DUSE_MATTER_DEVICE
+                          -DCODE_IMAGE_STR='"matter"'
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc-matter.bin"'
+
+[env:tasmota32s3cdc-matter]
+extends                 = env:tasmota32_base
+board_build.f_flash     = 80000000L
+board_build.f_cpu       = 240000000L
+board_build.flash_mode  = qio
+board                   = esp32s3cdc-qio_qspi
+build_flags             = ${env:tasmota32_base.build_flags}
+                         -DFIRMWARE_TASMOTA32
+                         -DUSE_MATTER_DEVICE
+                         -DCODE_IMAGE_STR='"matter"'
+                         -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3cdc-matter.bin"'
+lib_ignore              =
+                          TTGO TWatch Library
+                          Micro-RTSP
+                          epdiy
+
 [env:tasmota32c3-safeboot]
 extends                 = env:tasmota32_base
 board                   = esp32c3