diff --git a/coreos-init-build-env b/coreos-init-build-env
index 6841e38..a385606 100755
--- a/coreos-init-build-env
+++ b/coreos-init-build-env
@@ -27,7 +27,7 @@ COREOS_ROOT=$(readlink -f "${COREOS_ROOT}")
 # All theses values can be overriden by the caller of coreos-init-build-env
 BITBAKEDIR="${BITBAKEDIR:-${COREOS_ROOT}/bitbake}"
 OEROOT="${OEROOT:-${COREOS_ROOT}/external-layers/openembedded-core}"
-TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/templates}"
+TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/layers/meta-belden-coreos/conf/templates/default}"
 
 # Sanity checks
 # ------------------------------------------------------------------------------
diff --git a/templates/bblayers.conf.sample b/layers/meta-belden-coreos/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from templates/bblayers.conf.sample
rename to layers/meta-belden-coreos/conf/templates/default/bblayers.conf.sample
diff --git a/templates/conf-notes.txt b/layers/meta-belden-coreos/conf/templates/default/conf-notes.txt
similarity index 100%
rename from templates/conf-notes.txt
rename to layers/meta-belden-coreos/conf/templates/default/conf-notes.txt
diff --git a/templates/local.conf.sample b/layers/meta-belden-coreos/conf/templates/default/local.conf.sample
similarity index 100%
rename from templates/local.conf.sample
rename to layers/meta-belden-coreos/conf/templates/default/local.conf.sample