diff --git a/.gitmodules b/.gitmodules
index 3eb4044..5f390a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,6 +3,6 @@
 	url = ssh://git@bitbucket.gad.local:7999/ico/coreos.git
 	branch = master
 [submodule "layers/meta-netmodule-wlan"]
-	path = layers/meta-netmodule-wlan
+	path = external-layers/meta-netmodule-wlan
 	url = gitea@git.netmodule.intranet:nrsw-oe/meta-netmodule-wlan.git
 	branch = kirkstone
diff --git a/layers/meta-netmodule-wlan b/external-layers/meta-netmodule-wlan
similarity index 100%
rename from layers/meta-netmodule-wlan
rename to external-layers/meta-netmodule-wlan
diff --git a/nwl-init-build-env b/nwl-init-build-env
index a29effe..46d422c 100755
--- a/nwl-init-build-env
+++ b/nwl-init-build-env
@@ -30,6 +30,7 @@ TEMPLATECONF="${NWL_ROOT}/templates"
 
 # Add support for ##NWLS_LAYERSDIR## inside of bblayer template
 coreos-bblayers-envsub NWL_LAYERSDIR "${NWL_ROOT}/layers"
+coreos-bblayers-envsub NWL_EXTLAYERSDIR "${NWL_ROOT}/external-layers"
 
 # Add the scripts directory of the NWL to the path
 coreos_path_add "${NWL_ROOT}/scripts"
diff --git a/templates/bblayers.conf.sample b/templates/bblayers.conf.sample
index cad2294..2f1cf6f 100644
--- a/templates/bblayers.conf.sample
+++ b/templates/bblayers.conf.sample
@@ -20,6 +20,6 @@ BBLAYERS ?= " \
   ##COREOS_EXTLAYERSDIR##/meta-swupdate \
   ##NWL_LAYERSDIR##/meta-nwl-distro \
   ##NWL_LAYERSDIR##/meta-netmodule-legacy-bsp \
-  ##NWL_LAYERSDIR##/meta-netmodule-wlan \
+  ##NWL_EXTLAYERSDIR##/meta-netmodule-wlan \
   "