diff --git a/minecraft-bedrock-schemas b/minecraft-bedrock-schemas
index a4a525e94..b788f118f 160000
--- a/minecraft-bedrock-schemas
+++ b/minecraft-bedrock-schemas
@@ -1 +1 @@
-Subproject commit a4a525e94a7a89e2f7a1c99d7b769651fdb14872
+Subproject commit b788f118ff61858827fccc7cc3079689b15796ca
diff --git a/package.json b/package.json
index d8e2a6c0b..18a49fbb6 100644
--- a/package.json
+++ b/package.json
@@ -643,8 +643,16 @@
       },
       {
         "fileMatch": [
-          "entity/*.{json,jsonc,json5}",
-          "entity/**/*.{json,jsonc,json5}",
+          "resource_packs/*/entity/*.{json,jsonc,json5}",
+          "*resource*pack*/entity/*.{json,jsonc,json5}",
+          "*Resource*Pack*/entity/*.{json,jsonc,json5}",
+          "*RP*/entity/*.{json,jsonc,json5}",
+          "*rp*/entity/*.{json,jsonc,json5}",
+          "resource_packs/*/entity/**/*.{json,jsonc,json5}",
+          "*resource*pack*/entity/**/*.{json,jsonc,json5}",
+          "*Resource*Pack*/entity/**/*.{json,jsonc,json5}",
+          "*RP*/entity/**/*.{json,jsonc,json5}",
+          "*rp*/entity/**/*.{json,jsonc,json5}",
           "*.{entity.rp,e.rp,ce,rpe,actor,entity}.{json,jsonc,json5}",
           "!models/entity/**/*.{json,jsonc,json5}",
           "!models/entity/*.{json,jsonc,json5}"