diff --git a/.gitmodules b/.gitmodules
index 7cefd08..6b44124 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,22 +3,22 @@
 	url = ssh://git@bitbucket.gad.local:7999/ico/bitbake.git
 	branch = 2.0
 [submodule "layers/openembedded-core"]
-	path = layers/openembedded-core
+	path = external-layers/openembedded-core
 	url = ssh://git@bitbucket.gad.local:7999/ico/openembedded-core.git
 	branch = kirkstone
 [submodule "layers/meta-openembedded"]
-	path = layers/meta-openembedded
+	path = external-layers/meta-openembedded
 	url = ssh://git@bitbucket.gad.local:7999/ico/meta-openembedded.git
 	branch = kirkstone
 [submodule "layers/meta-virtualization"]
-	path = layers/meta-virtualization
+	path = external-layers/meta-virtualization
 	url = ssh://git@bitbucket.gad.local:7999/ico/meta-virtualization.git
 	branch = kirkstone
 [submodule "layers/meta-efibootguard"]
-	path = layers/meta-efibootguard
+	path = external-layers/meta-efibootguard
 	url = ssh://git@bitbucket.gad.local:7999/ico/meta-efibootguard.git
 	branch = master
 [submodule "layers/meta-swupdate"]
-	path = layers/meta-swupdate
+	path = external-layers/meta-swupdate
 	url = ssh://git@bitbucket.gad.local:7999/ico/meta-swupdate.git
 	branch = kirkstone
diff --git a/coreos-init-build-env b/coreos-init-build-env
index 4c9762e..f7dac82 100755
--- a/coreos-init-build-env
+++ b/coreos-init-build-env
@@ -26,7 +26,7 @@ COREOS_ROOT=$(readlink -f "${COREOS_ROOT}")
 # Set the path to bitbake, openembedded-core and the template directory
 # All theses values can be overriden by the caller of coreos-init-build-env
 BITBAKEDIR="${BITBAKEDIR:-${COREOS_ROOT}/bitbake}"
-OEROOT="${OEROOT:-${COREOS_ROOT}/layers/openembedded-core}"
+OEROOT="${OEROOT:-${COREOS_ROOT}/external-layers/openembedded-core}"
 TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/templates}"
 
 # Sanity checks
@@ -84,6 +84,9 @@ coreos_path_add "${COREOS_ROOT}/scripts"
 # Add support for ##COREOS_LAYERSDIR## inside of bblayer template
 coreos-bblayers-envsub COREOS_LAYERSDIR "${COREOS_ROOT}/layers"
 
+# Add support for ##COREOS_EXTLAYERSDIR## inside of bblayer template
+coreos-bblayers-envsub COREOS_EXTLAYERSDIR "${COREOS_ROOT}/external-layers"
+
 # Generate the ${BUILDDIR}/key directory. The scripts doesn't generate anything it
 # the directory already exist, so it's safe to call it everytime
 coreos-keygen > /dev/null 2> /dev/null
diff --git a/layers/meta-efibootguard b/external-layers/meta-efibootguard
similarity index 100%
rename from layers/meta-efibootguard
rename to external-layers/meta-efibootguard
diff --git a/layers/meta-openembedded b/external-layers/meta-openembedded
similarity index 100%
rename from layers/meta-openembedded
rename to external-layers/meta-openembedded
diff --git a/layers/meta-swupdate b/external-layers/meta-swupdate
similarity index 100%
rename from layers/meta-swupdate
rename to external-layers/meta-swupdate
diff --git a/layers/meta-virtualization b/external-layers/meta-virtualization
similarity index 100%
rename from layers/meta-virtualization
rename to external-layers/meta-virtualization
diff --git a/layers/openembedded-core b/external-layers/openembedded-core
similarity index 100%
rename from layers/openembedded-core
rename to external-layers/openembedded-core
diff --git a/templates/bblayers.conf.sample b/templates/bblayers.conf.sample
index ccc0dc2..3f03f07 100644
--- a/templates/bblayers.conf.sample
+++ b/templates/bblayers.conf.sample
@@ -11,12 +11,12 @@ BBLAYERS ?= " \
   ##COREOS_LAYERSDIR##/meta-belden-coreos-bsp \
   ##COREOS_LAYERSDIR##/meta-belden-coreos-demo \
   ##COREOS_LAYERSDIR##/meta-belden-marvell-bsp \
-  ##COREOS_LAYERSDIR##/meta-openembedded/meta-oe \
-  ##COREOS_LAYERSDIR##/meta-openembedded/meta-networking \
-  ##COREOS_LAYERSDIR##/meta-openembedded/meta-filesystems \
-  ##COREOS_LAYERSDIR##/meta-openembedded/meta-python \
-  ##COREOS_LAYERSDIR##/meta-openembedded/meta-webserver \
-  ##COREOS_LAYERSDIR##/meta-virtualization \
-  ##COREOS_LAYERSDIR##/meta-efibootguard \
-  ##COREOS_LAYERSDIR##/meta-swupdate \
+  ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-oe \
+  ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-networking \
+  ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-filesystems \
+  ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-python \
+  ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-webserver \
+  ##COREOS_EXTLAYERSDIR##/meta-virtualization \
+  ##COREOS_EXTLAYERSDIR##/meta-efibootguard \
+  ##COREOS_EXTLAYERSDIR##/meta-swupdate \
   "