diff --git a/.github/workflows/CI_github_ESP32.yml b/.github/workflows/CI_github_ESP32.yml
index 2a576e40d..25c761f11 100644
--- a/.github/workflows/CI_github_ESP32.yml
+++ b/.github/workflows/CI_github_ESP32.yml
@@ -24,6 +24,26 @@ jobs:
         name: firmware
         path: ./build_output
 
+  tasmota32solo1:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio
+        platformio upgrade --dev
+        platformio update
+    - name: Run PlatformIO
+      run: |
+        platformio run -e tasmota32solo1
+    - uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: ./build_output
+
   tasmota32-webcam:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/Tasmota_build.yml b/.github/workflows/Tasmota_build.yml
index 47736dea5..eddfe59a6 100644
--- a/.github/workflows/Tasmota_build.yml
+++ b/.github/workflows/Tasmota_build.yml
@@ -724,6 +724,26 @@ jobs:
         path: ./build_output
 
 
+  tasmota32solo1:
+    needs: tasmota_pull
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+    - name: Install dependencies
+      run: |
+        pip install -U platformio
+    - name: Run PlatformIO
+      run: |
+        platformio run -e tasmota32solo1
+    - uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: ./build_output
+
+
   tasmota32-webcam:
     needs: tasmota_pull
     runs-on: ubuntu-latest
@@ -1394,6 +1414,7 @@ jobs:
         [ ! -f ./mv_firmware/firmware/tasmota-knx.* ] || mv ./mv_firmware/firmware/tasmota-knx.* ./firmware/tasmota/
         [ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
         [ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
+        [ ! -f ./mv_firmware/firmware/tasmota32solo1*.* ] || mv ./mv_firmware/firmware/tasmota32solo1*.* ./firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index e00ae3788..bb491497a 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -724,6 +724,26 @@ jobs:
         path: ./build_output
 
 
+  tasmota32solo1:
+    needs: tasmota_pull
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+    - name: Install dependencies
+      run: |
+        pip install -U platformio
+    - name: Run PlatformIO
+      run: |
+        platformio run -e tasmota32solo1
+    - uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: ./build_output
+
+
   tasmota32-webcam:
     needs: tasmota_pull
     runs-on: ubuntu-latest
@@ -1394,6 +1414,7 @@ jobs:
         [ ! -f ./mv_firmware/firmware/tasmota-knx.* ] || mv ./mv_firmware/firmware/tasmota-knx.* ./firmware/tasmota/
         [ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
         [ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
+        [ ! -f ./mv_firmware/firmware/tasmota32solo1*.* ] || mv ./mv_firmware/firmware/tasmota32solo1*.* ./firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index ff0f7b1ad..d1897880a 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -162,14 +162,6 @@ lib_extra_dirs              =
 ; *** Mostly not used functions. Recommended to disable
                               lib/lib_div
 
-; *** Tasmota version for ESP32solo1 (used in some Xiaomi devices)
-[env:tasmota32solo1]
-extends                     = env:tasmota32_base
-platform_packages           = tasmota/framework-arduinoespressif32 @ 3.10006.210420
-                              platformio/tool-mklittlefs @ ~1.203.200522
-                              platformio/tool-esptoolpy @ ~1.30000.0
-build_unflags               = ${esp32_defaults.build_unflags}
-build_flags                 = ${common32.build_flags}
 
 ; *** EXPERIMENTAL Tasmota version for ESP32-S2
 [env:tasmota32s2]
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 5fcce4ee5..ee73c67ec 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -32,6 +32,11 @@ lib_ignore              =
 extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
 
+[env:tasmota32solo1]
+extends                 = env:tasmota32_base
+platform_packages       = tasmota/framework-arduinoespressif32 @ 3.10006.210420
+build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
+
 [env:tasmota32-webcam]
 extends                 = env:tasmota32_base
 board                   = esp32cam