diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b34360bb3..abae172a2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
   - [ ] Only relevant files were touched
   - [ ] Only one feature/fix was added per PR and the code change compiles without warnings
   - [ ] The code change is tested and works with Tasmota core ESP8266 V.2.7.8
-  - [ ] The code change is tested and works with Tasmota core ESP32 V.3.1.5
+  - [ ] The code change is tested and works with Tasmota core ESP32 V.3.1.6
   - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
 
 _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_
diff --git a/boards/esp32-solo1.json b/boards/esp32-solo1.json
index 1202c7a8b..794bccaaf 100644
--- a/boards/esp32-solo1.json
+++ b/boards/esp32-solo1.json
@@ -6,6 +6,7 @@
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
+    "chip_variant": "esp32u",
     "variant": "esp32",
     "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"
   },
@@ -41,13 +42,6 @@
   "download": {
     "speed": 230400
   },
-  "espidf": {
-    "custom_sdkconfig": [
-      "CONFIG_FREERTOS_UNICORE=y",
-      "# CONFIG_BOOTLOADER_SPI_CUSTOM_WP_PIN is not set",
-      "CONFIG_BOOTLOADER_SPI_WP_PIN=7"
-    ]
-  },
   "url": "https://www.espressif.com/sites/default/files/documentation/esp32-solo-1_datasheet_en.pdf",
   "vendor": "Espressif"
 }
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 4a15f5c69..cfd06b209 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -97,7 +97,7 @@ custom_component_remove     =
                               espressif/cmake_utilities
 
 [core32]
-platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2025.11.30/platform-espressif32.zip
+platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2025.11.31/platform-espressif32.zip
 platform_packages           =
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 1461d0a96..09799ecc0 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -35,18 +35,10 @@ build_flags             = ${env:tasmota32_base.build_flags}
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-safeboot.bin"'
 lib_extra_dirs          = lib/lib_ssl, lib/libesp32
 lib_ignore              = ${safeboot_flags.lib_ignore}
-custom_sdkconfig        = '# CONFIG_SPIRAM is not set'
-                          '# CONFIG_BT_ENABLED is not set'
+custom_sdkconfig        = '# CONFIG_BT_ENABLED is not set'
                           CONFIG_BT_DISABLED=y
                           '# CONFIG_BT_NIMBLE_ENABLED is no set'
                           CONFIG_BT_NIMBLE_DISABLED=y
-                          '# CONFIG_ULP_COPROC_ENABLED is not set'
-                          CONFIG_ULP_COPROC_DISABLED=y
-                          '# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set'
 custom_component_remove = ${safeboot_flags.custom_component_remove}
 
 [env:tasmota32solo1-safeboot]
@@ -58,18 +50,10 @@ build_flags             = ${env:tasmota32_base.build_flags}
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32solo1-safeboot.bin"'
 lib_extra_dirs          = lib/lib_ssl, lib/libesp32
 lib_ignore              = ${safeboot_flags.lib_ignore}
-custom_sdkconfig        = '# CONFIG_SPIRAM is not set'
-                          '# CONFIG_BT_ENABLED is not set'
+custom_sdkconfig        = '# CONFIG_BT_ENABLED is not set'
                           CONFIG_BT_DISABLED=y
                           '# CONFIG_BT_NIMBLE_ENABLED is no set'
                           CONFIG_BT_NIMBLE_DISABLED=y
-                          '# CONFIG_ULP_COPROC_ENABLED is not set'
-                          CONFIG_ULP_COPROC_DISABLED=y
-                          '# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set'
 custom_component_remove = ${safeboot_flags.custom_component_remove}
 
 [env:tasmota32s2-safeboot]
@@ -272,13 +256,6 @@ build_flags             = ${env:tasmota32_base.build_flags}
 lib_ignore              = ${env:tasmota32_base.lib_ignore}
                           Micro-RTSP
                           epdiy
-custom_sdkconfig        =
-                          '# CONFIG_SPIRAM is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set'
-                          '# CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set'
 
 [env:tasmota32s2]
 extends                 = env:tasmota32_base