diff --git a/conf/layer.conf b/conf/layer.conf
index 04985e8..ce7302d 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,12 +5,19 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# Device-dependent locations
+BBFILES_DYNAMIC += " \
+    freescale-layer:${LAYERDIR}/dynamic-layers/meta-freescale/recipes-*/*/*.bb \
+    freescale-layer:${LAYERDIR}/dynamic-layers/meta-freescale/recipes-*/*/*.bbappend \
+    freescale-distro:${LAYERDIR}/dynamic-layers/meta-freescale-distro/recipes-*/*/*.bb \
+    freescale-distro:${LAYERDIR}/dynamic-layers/meta-freescale-distro/recipes-*/*/*.bbappend \
+    imx-frdm-sdk-release:${LAYERDIR}/dynamic-layers/meta-imx-sdk/recipes-*/*/*.bb \
+    imx-frdm-sdk-release:${LAYERDIR}/dynamic-layers/meta-imx-sdk/recipes-*/*/*.bbappend \
+"
+
 BBFILE_COLLECTIONS += "meta-openhd"
 BBFILE_PATTERN_meta-openhd = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-openhd = "6"
 
 LAYERDEPENDS_meta-openhd = "core"
-LAYERSERIES_COMPAT_meta-openhd = "kirkstone scarthgap"
-
-# Prevent linux-imx customizations from affecting kirkstone-based BSPs
-BBMASK:append:kirkstone = "|linux-imx_%.bbappend"
+LAYERSERIES_COMPAT_meta-openhd = "kirkstone scarthgap"
\ No newline at end of file
diff --git a/recipes-fsl/images/fsl-image-network-full-cmdline.bbappend b/dynamic-layers/meta-freescale-distro/recipes-fsl/images/fsl-image-network-full-cmdline.bbappend
similarity index 100%
rename from recipes-fsl/images/fsl-image-network-full-cmdline.bbappend
rename to dynamic-layers/meta-freescale-distro/recipes-fsl/images/fsl-image-network-full-cmdline.bbappend
diff --git a/recipes-kernel/linux/linux-imx/mwifiex.config b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-imx/mwifiex.config
rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.cfg
diff --git a/recipes-kernel/linux/linux-imx/os08a20-wlan.config b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-imx/os08a20-wlan.config
rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.cfg
diff --git a/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend
new file mode 100644
index 0000000..e480acf
--- /dev/null
+++ b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-imx:"
+
+SRC_URI:append = " file://os08a20-wlan.cfg"
+
diff --git a/recipes-fsl/images/imx-image-base.bbappend b/dynamic-layers/meta-imx-sdk/recipes-fsl/images/imx-image-base.bbappend
similarity index 100%
rename from recipes-fsl/images/imx-image-base.bbappend
rename to dynamic-layers/meta-imx-sdk/recipes-fsl/images/imx-image-base.bbappend
diff --git a/recipes-kernel/linux/linux-imx_%.bbappend b/recipes-kernel/linux/linux-imx_%.bbappend
deleted file mode 100644
index bfba5d0..0000000
--- a/recipes-kernel/linux/linux-imx_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-imx:"
-
-SRC_URI:append = " file://os08a20-wlan.config"
-DELTA_KERNEL_DEFCONFIG:append = " os08a20-wlan.config"
diff --git a/recipes-openhd/openhd/openhd_git.bb b/recipes-openhd/openhd/openhd_git.bb
index 7421d37..77f7249 100644
--- a/recipes-openhd/openhd/openhd_git.bb
+++ b/recipes-openhd/openhd/openhd_git.bb
@@ -15,6 +15,9 @@ S = "${WORKDIR}/git/OpenHD"
 
 inherit cmake pkgconfig systemd
 
+PACKAGECONFIG ??= "webui"
+PACKAGECONFIG[webui] = ",,,openhd-webui"
+
 DEPENDS = "flac poco libsodium gstreamer1.0 gstreamer1.0-plugins-base libpcap libusb1 libv4l"
 
 RDEPENDS:${PN} += " \
@@ -25,7 +28,6 @@ RDEPENDS:${PN} += " \
   gstreamer1.0-plugins-ugly \
   gstreamer1.0-libav \
   v4l-utils \
-  openhd-webui \
 "
 
 SYSTEMD_SERVICE:${PN} = "openhd_mod.service"
diff --git a/recipes-support/poco/poco_%.bbappend b/recipes-support/poco/poco_%.bbappend
new file mode 100644
index 0000000..aacfab2
--- /dev/null
+++ b/recipes-support/poco/poco_%.bbappend
@@ -0,0 +1,9 @@
+# poco upstream changed from 'master' to 'main':
+# - kirkstone uses 1.11.2, with the pinned SRCREV in 'main'
+# - scarthgap uses 1.12.5, with the pinned SRCREV *NOT* in 'main', but in a leftover branch
+# FIXME: Both are fixed in upstream meta-openembedded, remove this bbappend after updating
+
+POCO_FETCH_BRANCH = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'scarthgap', 'poco-1.12.5', 'main', d)}"
+
+SRC_URI:remove = "git://github.com/pocoproject/poco.git;branch=master;protocol=https"
+SRC_URI:append = " git://github.com/pocoproject/poco.git;branch=${POCO_FETCH_BRANCH};protocol=https"
diff --git a/recipes-support/poco/poco_1.12.5p2.bbappend b/recipes-support/poco/poco_1.12.5p2.bbappend
deleted file mode 100644
index 30fbc17..0000000
--- a/recipes-support/poco/poco_1.12.5p2.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix fetch: the pinned SRCREV is on branch 'poco-1.12.5', not 'master'
-SRC_URI:remove = "git://github.com/pocoproject/poco.git;branch=master;protocol=https"
-SRC_URI:append = " git://github.com/pocoproject/poco.git;branch=poco-1.12.5;protocol=https"