diff --git a/recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt b/bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt
similarity index 100%
rename from recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt
rename to bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt
diff --git a/recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt-init.service b/bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt-init.service
similarity index 100%
rename from recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt-init.service
rename to bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/files/jody-w1-bt-init.service
diff --git a/recipes-connectivity/jody-w1-bt-hcd/jody-w1-bt-hcd.bbappend b/bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/jody-w1-bt-hcd.bbappend
similarity index 100%
rename from recipes-connectivity/jody-w1-bt-hcd/jody-w1-bt-hcd.bbappend
rename to bbappends/ublox-module/recipes-connectivity/jody-w1-bt-hcd/jody-w1-bt-hcd.bbappend
diff --git a/recipes-imx/jody-w1-driver-pcie/files/0001-Disable-wowlan_config.patch b/bbappends/ublox-module/recipes-kernel/jody-w1-driver-pcie/files/0001-Disable-wowlan_config.patch
similarity index 100%
rename from recipes-imx/jody-w1-driver-pcie/files/0001-Disable-wowlan_config.patch
rename to bbappends/ublox-module/recipes-kernel/jody-w1-driver-pcie/files/0001-Disable-wowlan_config.patch
diff --git a/recipes-imx/jody-w1-driver-pcie/jody-w1-driver-pcie_%.bbappend b/bbappends/ublox-module/recipes-kernel/jody-w1-driver-pcie/jody-w1-driver-pcie_%.bbappend
similarity index 100%
rename from recipes-imx/jody-w1-driver-pcie/jody-w1-driver-pcie_%.bbappend
rename to bbappends/ublox-module/recipes-kernel/jody-w1-driver-pcie/jody-w1-driver-pcie_%.bbappend
diff --git a/conf/layer.conf b/conf/layer.conf
index 2a4e7f1..db7193a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,6 +5,8 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 	    ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+BBFILES_DYNAMIC = "meta-ublox-module:${LAYERDIR}/bbappends/ublox-module/recipes-*/*/*.bbappend"
+
 
 BBFILE_COLLECTIONS += "netmodule-bsp"
 BBFILE_PATTERN_netmodule-bsp = "^${LAYERDIR}/"
@@ -18,17 +20,3 @@ LAYERDEPENDS_netmodule-bsp = "core"
 
 LAYERSERIES_COMPAT_netmodule-bsp = "warrior"
 
-# mask all imx8 specific recipes out for e.g. am335x build
-IMX_ONLY_RECIPES = " \
-                       recipes-imx \
-                       recipes-connectivity/jody-w1-bt-hcd \
-                       "
-
-# mask all non related imx8 recipes out
-NOT_AVAILABLE_ON_IMX = " \
-                       recipes-connectivity/wlconf-bin \
-                       "
-# TODO: use MACHINE for complete board e.g. nmhwXX-type
-BBMASK += " \
-  ${@bb.utils.contains('MACHINE_TYPE', 'imx8', "${NOT_AVAILABLE_ON_IMX}", "${IMX_ONLY_RECIPES}", d)} \
-  "