diff --git a/pio-tools/override_copy.py b/pio-tools/override_copy.py
index 5318f9169..4f17079b2 100644
--- a/pio-tools/override_copy.py
+++ b/pio-tools/override_copy.py
@@ -13,3 +13,9 @@ if os.path.isfile("platformio_override.ini"):
     print ("*** use provided platformio_override.ini as planned ***")
 else: 
     shutil.copy("platformio_override_sample.ini", "platformio_override.ini")
+
+# copy platformio_tasmota_cenv_sample.ini to platformio_tasmota_cenv.ini
+if os.path.isfile("platformio_tasmota_cenv.ini"):
+    print ("*** use provided platformio_tasmota_cenv.ini as planned ***")
+else: 
+    shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini")
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index ef42c9580..b9a9a7654 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -11,6 +11,7 @@
 [platformio]
 ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run
 ;core_dir = .platformio
+; Custom config Zigbee [env] -> platformio_tasmota_cenv_example.ini
 extra_configs = platformio_tasmota_cenv.ini
 
 ; *** Build/upload environment
@@ -161,63 +162,3 @@ lib_extra_dirs              =
                               lib/lib_rf
 ; *** Mostly not used functions. Recommended to disable
                               lib/lib_div
-
-
-; *** EXPERIMENTAL Tasmota version for ESP32-S2
-[env:tasmota32s2]
-extends                     = env:tasmota32_base
-board                       = esp32s2
-board_build.flash_mode      = qio
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
-                              platformio/tool-mklittlefs @ ~1.203.200522
-                              platformio/tool-esptoolpy @ ~1.30000.0
-build_unflags               = ${esp32_defaults.build_unflags}
-build_flags                 = ${common32.build_flags} -DFIRMWARE_LITE
-lib_extra_dirs              = lib/libesp32
-lib_ignore                  =
-    NimBLE-Arduino
-    Micro-RTSP
-    ESP32-HomeKit
-
-
-; *** EXPERIMENTAL Tasmota version for ESP32-C3
-[env:tasmota32c3]
-extends                     = env:tasmota32_base
-board                       = esp32c3
-platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
-                              tasmota/toolchain-riscv32
-                              platformio/tool-mklittlefs @ ~1.203.200522
-build_unflags               = ${esp32_defaults.build_unflags} -mtarget-align
-build_flags                 = ${esp32_defaults.build_flags} -DFIRMWARE_LITE
-                              -I$PROJECT_DIR/include
-                              -include "fix_esp32c3.h"
-                              ;-DESP32_STAGE=true
-lib_extra_dirs              = lib/libesp32
-lib_ignore                  =
-    NimBLE-Arduino
-    Micro-RTSP
-
-; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
-[env:tasmota32idf4]
-extends                     = env:tasmota32_base
-platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
-                              platformio/tool-mklittlefs @ ~1.203.200522
-build_unflags               = ${esp32_defaults.build_unflags}
-build_flags                 = ${esp32_defaults.build_flags}
-                              ;-DESP32_STAGE=true
-
-; *** Debug version used for PlatformIO Home Project Inspection
-[env:tasmota-debug]
-build_type                  = debug
-build_unflags               = ${esp_defaults.build_unflags}
-build_flags                 = ${esp82xx_defaults.build_flags}
-;                              -Wstack-usage=300
-
-[env:tasmota32-debug]
-extends                     = env:tasmota32_base
-build_type                  = debug
-build_unflags               = ${esp32_defaults.build_unflags}
-build_flags                 = ${esp32_defaults.build_flags}
-;                              -Wstack-usage=300
diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
new file mode 100644
index 000000000..6570d9e36
--- /dev/null
+++ b/platformio_tasmota_cenv_sample.ini
@@ -0,0 +1,63 @@
+[env:tasmota-zigbee]
+board = esp8266_4M2M
+build_flags  = ${common.build_flags}
+                          -DUSE_ZIGBEE
+                          -DUSE_UFILESYS
+
+; *** EXPERIMENTAL Tasmota version for ESP32-S2
+[env:tasmota32s2]
+extends                     = env:tasmota32_base
+board                       = esp32s2
+board_build.flash_mode      = qio
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
+                              platformio/tool-mklittlefs @ ~1.203.200522
+                              platformio/tool-esptoolpy @ ~1.30000.0
+build_unflags               = ${esp32_defaults.build_unflags}
+build_flags                 = ${common32.build_flags} -DFIRMWARE_LITE
+lib_extra_dirs              = lib/libesp32
+lib_ignore                  =
+    NimBLE-Arduino
+    Micro-RTSP
+    ESP32-HomeKit
+
+; *** EXPERIMENTAL Tasmota version for ESP32-C3
+[env:tasmota32c3]
+extends                     = env:tasmota32_base
+board                       = esp32c3
+platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
+                              tasmota/toolchain-riscv32
+                              platformio/tool-mklittlefs @ ~1.203.200522
+build_unflags               = ${esp32_defaults.build_unflags} -mtarget-align
+build_flags                 = ${esp32_defaults.build_flags} -DFIRMWARE_LITE
+                              -I$PROJECT_DIR/include
+                              -include "fix_esp32c3.h"
+                              ;-DESP32_STAGE=true
+lib_extra_dirs              = lib/libesp32
+lib_ignore                  =
+    NimBLE-Arduino
+    Micro-RTSP
+
+; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
+[env:tasmota32idf4]
+extends                     = env:tasmota32_base
+platform                    = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
+                              platformio/tool-mklittlefs @ ~1.203.200522
+build_unflags               = ${esp32_defaults.build_unflags}
+build_flags                 = ${esp32_defaults.build_flags}
+                              ;-DESP32_STAGE=true
+
+; *** Debug version used for PlatformIO Home Project Inspection
+[env:tasmota-debug]
+build_type                  = debug
+build_unflags               = ${esp_defaults.build_unflags}
+build_flags                 = ${esp82xx_defaults.build_flags}
+;                              -Wstack-usage=300
+
+[env:tasmota32-debug]
+extends                     = env:tasmota32_base
+build_type                  = debug
+build_unflags               = ${esp32_defaults.build_unflags}
+build_flags                 = ${esp32_defaults.build_flags}
+;                              -Wstack-usage=300