diff --git a/conf/layer.conf b/conf/layer.conf
index e19a38b..2a4e7f1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,11 +18,17 @@ LAYERDEPENDS_netmodule-bsp = "core"
 
 LAYERSERIES_COMPAT_netmodule-bsp = "warrior"
 
-IMX_MASK_COLLECTION = " \
+# 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', '', "${IMX_MASK_COLLECTION}", d)} \
+  ${@bb.utils.contains('MACHINE_TYPE', 'imx8', "${NOT_AVAILABLE_ON_IMX}", "${IMX_ONLY_RECIPES}", d)} \
   "