diff --git a/.github/configs/release/imx8qxp-b0-mek-scarthgap.yaml b/.github/configs/release/imx8qxp-b0-mek-scarthgap.yaml
index d6cf8a7..0e23698 100644
--- a/.github/configs/release/imx8qxp-b0-mek-scarthgap.yaml
+++ b/.github/configs/release/imx8qxp-b0-mek-scarthgap.yaml
@@ -3,9 +3,13 @@ header:
 _source_dir: .
 repos:
     meta-freescale:
-        commit: d015b23d0ac89c744557848a8bce79729dc9e351
-        path: layers/meta-freescale
         url: https://github.com/Freescale/meta-freescale.git
+        path: layers/meta-freescale
+        patches:
+            fix-build-issue:
+                path: patches/meta-freescale/0001-Revert-conf-machine-Update-dtb-list-for-6.6.52_2.0.0.patch
+                repo: meta-pantavisor
+        commit: be9267fca85959c79b19ab65e48c8f3d7faf2b40
     meta-freescale-3rdparty:
         commit: 1dfc65dd2006b51d156be5bcda0e3c72c936ad0a
         path: layers/meta-freescale-3rdparty
diff --git a/kas/scarthgap-nxp.yaml b/kas/scarthgap-nxp.yaml
index a7efd68..97c7787 100644
--- a/kas/scarthgap-nxp.yaml
+++ b/kas/scarthgap-nxp.yaml
@@ -20,3 +20,8 @@ repos:
       meta-imx-ml:
       meta-imx-sdk:
 
+  meta-freescale:
+    patches:
+      fix-build-issue:
+        path: patches/meta-freescale/0001-Revert-conf-machine-Update-dtb-list-for-6.6.52_2.0.0.patch
+        repo: meta-pantavisor