diff --git a/lib/libesp32/Berry-HttpClientLight/library.json b/lib/libesp32/Berry-HttpClientLight/library.json
index 1e1479bbb..c9e5208f9 100644
--- a/lib/libesp32/Berry-HttpClientLight/library.json
+++ b/lib/libesp32/Berry-HttpClientLight/library.json
@@ -4,8 +4,8 @@
   "description": "Forked version of Arduino HttpClient to support BearSSL instead of mbedTLS",
   "license": "MIT",
   "homepage": "https://github.com/arendst/Tasmota",
-  "frameworks": "*",
-  "platforms": "*",
+  "frameworks": "arduino",
+  "platforms": "espressif32",
   "authors":
   {
     "name": "Stephan Hadinger",
diff --git a/lib/libesp32/Zip-readonly-FS/library.json b/lib/libesp32/Zip-readonly-FS/library.json
index a8c83f81b..e57844d30 100644
--- a/lib/libesp32/Zip-readonly-FS/library.json
+++ b/lib/libesp32/Zip-readonly-FS/library.json
@@ -4,8 +4,8 @@
     "description": "Simple filesystem to open an uncompressed ZIP file and read-only",
     "license": "MIT",
     "homepage": "https://github.com/arendst/Tasmota",
-    "frameworks": "*",
-    "platforms": "*",
+    "frameworks": "arduino",
+    "platforms": "espressif32",
     "authors":
     {
       "name": "Stephan Hadinger",
diff --git a/lib/libesp32/berry/library.json b/lib/libesp32/berry/library.json
index 705592bd5..901800fca 100644
--- a/lib/libesp32/berry/library.json
+++ b/lib/libesp32/berry/library.json
@@ -14,8 +14,8 @@
   },
   "version": "7.0",
   "license": "MIT License",
-  "frameworks": "*",
-  "platforms": "*",
+  "frameworks": "arduino",
+  "platforms": "espressif32",
   "build": {
     "srcFilter": [
         "+<*.c>",
diff --git a/lib/libesp32/berry_mapping/library.json b/lib/libesp32/berry_mapping/library.json
index 6bcf119fa..1add02751 100644
--- a/lib/libesp32/berry_mapping/library.json
+++ b/lib/libesp32/berry_mapping/library.json
@@ -4,8 +4,8 @@
     "description": "Mapping to C functions",
     "license": "MIT",
     "homepage": "https://github.com/arendst/Tasmota",
-    "frameworks": "*",
-    "platforms": "*",
+    "frameworks": "arduino",
+    "platforms": "espressif32",
     "authors":
     {
       "name": "Stephan Hadinger",
diff --git a/lib/libesp32/re1.5/library.json b/lib/libesp32/re1.5/library.json
index 8233b2142..7584bee24 100644
--- a/lib/libesp32/re1.5/library.json
+++ b/lib/libesp32/re1.5/library.json
@@ -8,6 +8,6 @@
       "type": "git",
       "url": "https://github.com/pfalcon/re1.5"
     },
-    "frameworks": "*",
-    "platforms": "*"
+    "frameworks": "arduino",
+    "platforms": "espressif32"
 }
\ No newline at end of file
diff --git a/lib/libesp32_div/esp32-camera/library.json b/lib/libesp32_div/esp32-camera/library.json
index 2147a3908..2f2c9fc1b 100644
--- a/lib/libesp32_div/esp32-camera/library.json
+++ b/lib/libesp32_div/esp32-camera/library.json
@@ -7,8 +7,8 @@
     "type": "git",
     "url": "https://github.com/espressif/esp32-camera"
   },
-  "frameworks": "*",
-  "platforms": "*",
+  "frameworks": "arduino",
+  "platforms": "espressif32",
   "build": {
     "flags": [
       "-Idriver/include",
@@ -16,8 +16,7 @@
       "-Idriver/private_include",
       "-Iconversions/private_include",
       "-Isensors/private_include",
-      "-Itarget/private_include",
-      "-fno-rtti"
+      "-Itarget/private_include"
     ],
     "includeDir": ".",
     "srcDir": ".",
diff --git a/lib/libesp32_lvgl/freetype/library.json b/lib/libesp32_lvgl/freetype/library.json
index 1349b099a..f8864de49 100644
--- a/lib/libesp32_lvgl/freetype/library.json
+++ b/lib/libesp32_lvgl/freetype/library.json
@@ -8,8 +8,8 @@
     "type": "git",
     "url": "https://gitlab.freedesktop.org/freetype"
 	},
-  "frameworks": "*",
-  "platforms": "*",
+  "frameworks": "arduino",
+  "platforms": "espressif32",
   "build": {
     "srcFilter": [
         "+<base/ftsystem.c>",
diff --git a/lib/libesp32_lvgl/lv_berry/library.json b/lib/libesp32_lvgl/lv_berry/library.json
index c5cd36d2f..cecb243ce 100644
--- a/lib/libesp32_lvgl/lv_berry/library.json
+++ b/lib/libesp32_lvgl/lv_berry/library.json
@@ -4,8 +4,8 @@
     "description": "Mapping of LVGL functions to Berry",
     "license": "MIT",
     "homepage": "https://github.com/arendst/Tasmota",
-    "frameworks": "*",
-    "platforms": "*",
+    "frameworks": "arduino",
+    "platforms": "espressif32",
     "authors":
     {
       "name": "Stephan Hadinger",
diff --git a/lib/libesp32_lvgl/lvgl/library.json b/lib/libesp32_lvgl/lvgl/library.json
index 4582bb729..441a52235 100644
--- a/lib/libesp32_lvgl/lvgl/library.json
+++ b/lib/libesp32_lvgl/lvgl/library.json
@@ -12,8 +12,8 @@
 	},
 	"license": "MIT",
 	"homepage": "https://lvgl.io",
-	"frameworks": "*",
-	"platforms": "*",
+	"frameworks": "arduino",
+	"platforms": "espressif32",
 	"build": {
 	  "flags": [ "-I$PROJECT_DIR/tasmota/lvgl_berry" ]
 	}