diff --git a/platformio.ini b/platformio.ini
index 68ebd40a7..37cf9a174 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -87,7 +87,8 @@ upload_speed                = 115200
 upload_resetmethod          = nodemcu
 upload_port                 = COM5
 extra_scripts               = ${scripts_defaults.extra_scripts}
-lib_ldf_mode                = chain+
+lib_ldf_mode                = chain
+lib_compat_mode             = strict
 shared_libdeps_dir          = lib
 lib_extra_dirs              =
                               lib/lib_basic
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 37a9b345d..60c1ee7cd 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -136,7 +136,6 @@ build_flags                 = ${esp32_defaults.build_flags}
                               ;-DESP32_STAGE=true
 
 [library]
-lib_ldf_mode                = chain+
 shared_libdeps_dir          = lib
 ; *** Library disable / enable for variant Tasmota(32). Disable reduces compile time
 ; *** !!! Disabling needed libs will generate compile errors !!!
@@ -178,7 +177,6 @@ platform_packages           = framework-arduinoespressif32 @ https://github.com/
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${common32.build_flags}
 lib_ignore                  =
-    cc1101
     NimBLE-Arduino
     Micro-RTSP
     ESP32 Ethernet
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 61447455c..8bbbe5d0d 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -61,7 +61,8 @@ upload_port                 = ${common.upload_port}
 upload_resetmethod          = ${common.upload_resetmethod}
 upload_speed                = 921600
 extra_scripts               = ${common.extra_scripts}
-lib_ldf_mode                = chain+
+lib_ldf_mode                = ${common.lib_ldf_mode}
+lib_compat_mode             = ${common.lib_compat_mode}
 shared_libdeps_dir          = lib
 lib_extra_dirs              =
                               lib/libesp32
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 97da41979..cd468af55 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -16,6 +16,8 @@ upload_resetmethod      = ${common.upload_resetmethod}
 upload_speed            = ${common.upload_speed}
 extra_scripts           = ${common.extra_scripts}
 lib_extra_dirs          = ${common.lib_extra_dirs}
+lib_ldf_mode            = ${common.lib_ldf_mode}
+lib_compat_mode         = ${common.lib_compat_mode}
 lib_ignore              =
     Servo(esp8266)
     ESP8266AVRISP
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 5a1b1ec93..2324a9dd5 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -16,8 +16,9 @@ extra_scripts           = ${common32.extra_scripts}
 build_unflags           = ${common32.build_unflags}
 build_flags             = ${common32.build_flags}
 lib_extra_dirs          = ${common32.lib_extra_dirs}
+lib_ldf_mode            = ${common32.lib_ldf_mode}
+lib_compat_mode         = ${common32.lib_compat_mode}
 lib_ignore              =
-    cc1101
     ESP32 Azure IoT Arduino
     ESP32 Async UDP
     ESP32 BLE Arduino