diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index ad9baead7..d447ffbea 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -129,6 +129,17 @@ build_flags             = ${env:tasmota32_base.build_flags}
 lib_extra_dirs          = lib/lib_ssl, lib/libesp32
 lib_ignore              = ${safeboot_flags.lib_ignore}
 
+[env:tasmota32c3-safeboot]
+extends                 = env:tasmota32_base
+board                   = esp32c3
+build_unflags           = ${env:tasmota32_base.build_unflags}
+                          -mtarget-align
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -DFIRMWARE_SAFEBOOT
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3-safeboot.bin"'
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              = ${safeboot_flags.lib_ignore}
+
 [env:tasmota32c3cdc]
 extends                 = env:tasmota32_base
 board                   = esp32c3cdc
@@ -160,7 +171,7 @@ lib_ignore              = ${env:tasmota32_base.lib_ignore}
                           epdiy
 
 [env:tasmota32s2cdc-safeboot]
-extends                 = env:tasmota32s2-safeboot
+extends                 = env:tasmota32_base
 board                   = esp32s2cdc
 build_flags             = ${env:tasmota32_base.build_flags}
                           -DFIRMWARE_SAFEBOOT
@@ -184,6 +195,15 @@ build_flags             = ${env:tasmota32_base.build_flags}
 lib_extra_dirs          = lib/lib_ssl, lib/libesp32
 lib_ignore              = ${safeboot_flags.lib_ignore}
 
+[env:tasmota32s3-safeboot]
+extends                 = env:tasmota32_base
+board                   = esp32s3-qio_qspi
+build_flags             = ${env:tasmota32_base.build_flags}
+                         -DFIRMWARE_SAFEBOOT
+                         -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-safeboot.bin"'
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              = ${safeboot_flags.lib_ignore}
+
 [env:tasmota32s3cdc]
 extends                 = env:tasmota32_base
 board                   = esp32s3cdc-qio_qspi
@@ -239,12 +259,23 @@ extends                 = env:tasmota32_base
 board                   = esp32c6cdc
 build_unflags           = ${env:tasmota32_base.build_unflags}
                           -mtarget-align
-build_flags             = ${env:tasmota32c6cdc.build_flags}
+build_flags             = ${env:tasmota32_base.build_flags}
                           -DFIRMWARE_SAFEBOOT
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6cdc-safeboot.bin"'
 lib_extra_dirs          = lib/lib_ssl, lib/libesp32
 lib_ignore              = ${safeboot_flags.lib_ignore}
 
+[env:tasmota32c6-safeboot]
+extends                 = env:tasmota32_base
+board                   = esp32c6
+build_unflags           = ${env:tasmota32_base.build_unflags}
+                          -mtarget-align
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -DFIRMWARE_SAFEBOOT
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6-safeboot.bin"'
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              = ${safeboot_flags.lib_ignore}
+
 
 [env:tasmota32-AD]
 extends                 = env:tasmota32_base