diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index ce8387b60..57b225ae4 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -105,8 +105,8 @@ lib_ignore                  = TTGO TWatch Library
 [env:tasmota32-mi32]
 extends                     = env:tasmota32_base
 build_flags                 = ${env:tasmota32_base.build_flags}
+                              -DFIRMWARE_BLUETOOTH
                               -DUSE_MI_EXT_GUI
-                              -DUSE_MI_ESP32
                               -DOTA_URL='""'
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
 lib_ignore                  = ESP8266Audio
@@ -119,8 +119,8 @@ lib_ignore                  = ESP8266Audio
 [env:tasmota32c3-mi32]
 extends                     = env:tasmota32c3
 build_flags                 = ${env:tasmota32_base.build_flags}
+                              -DFIRMWARE_BLUETOOTH
                               -DUSE_MI_EXT_GUI
-                              -DUSE_MI_ESP32
                               -DOTA_URL='""'
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
 lib_ignore                  = ESP8266Audio
@@ -133,8 +133,8 @@ lib_ignore                  = ESP8266Audio
 [env:tasmota32s3-mi32]
 extends                     = env:tasmota32s3
 build_flags                 = ${env:tasmota32_base.build_flags}
+                              -DFIRMWARE_BLUETOOTH
                               -DUSE_MI_EXT_GUI
-                              -DUSE_MI_ESP32
                               -DOTA_URL='""'
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
 lib_ignore                  = ESP8266Audio
diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini
index b829b551c..e022bf70c 100644
--- a/platformio_tasmota_core3_env_sample.ini
+++ b/platformio_tasmota_core3_env_sample.ini
@@ -184,9 +184,8 @@ board                   = esp32c6cdc
 build_unflags           = ${env:arduino30.build_unflags}
                           -mtarget-align
 build_flags             = ${env:arduino30.build_flags}
-                          -DFIRMWARE_ARDUINO30
+                          -DFIRMWARE_BLUETOOTH
                           -DUSE_MI_EXT_GUI
-                          -DUSE_MI_ESP32
                           -DOTA_URL='""'
 monitor_filters         = esp32_exception_decoder
 lib_ignore              = ${env:arduino30.lib_ignore}
diff --git a/tasmota/include/tasmota_configurations_ESP32.h b/tasmota/include/tasmota_configurations_ESP32.h
index 9aeee9bc8..4a9716d16 100644
--- a/tasmota/include/tasmota_configurations_ESP32.h
+++ b/tasmota/include/tasmota_configurations_ESP32.h
@@ -272,12 +272,16 @@
 
 #define USE_SDCARD
 
-#define USE_ADC
+#ifndef USE_BERRY_ULP                              // potential performance gains with ULP
+  #define USE_ADC                                  // so do not use common ADC funtions in that case
+#endif
 //#undef USE_BERRY                                 // Disable Berry scripting language
 
 #define USE_ETHERNET                             // Add support for ethernet (+20k code)
-#define USE_BLE_ESP32                            // Enable full BLE driver
-#define USE_EQ3_ESP32
+#ifndef USE_MI_EXT_GUI
+  #define USE_BLE_ESP32                            // Enable full BLE driver
+  #define USE_EQ3_ESP32
+#endif // USE_MI_EXT_GUI
 #define USE_MI_ESP32                             // (ESP32 only) Add support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
 
 #endif  // FIRMWARE_BLUETOOTH