diff --git a/.templateconf b/.templateconf
index 0fe6f825038..faf03480777 100644
--- a/.templateconf
+++ b/.templateconf
@@ -1,2 +1,2 @@
 # Template settings
-TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf}
+TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf/templates/default}
diff --git a/meta-poky/conf/bblayers.conf.sample b/meta-poky/conf/templates/default/bblayers.conf.sample
similarity index 100%
rename from meta-poky/conf/bblayers.conf.sample
rename to meta-poky/conf/templates/default/bblayers.conf.sample
diff --git a/meta-poky/conf/conf-notes.txt b/meta-poky/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-poky/conf/conf-notes.txt
rename to meta-poky/conf/templates/default/conf-notes.txt
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-poky/conf/local.conf.sample
rename to meta-poky/conf/templates/default/local.conf.sample
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/templates/default/local.conf.sample.extended
similarity index 100%
rename from meta-poky/conf/local.conf.sample.extended
rename to meta-poky/conf/templates/default/local.conf.sample.extended
diff --git a/meta-poky/conf/site.conf.sample b/meta-poky/conf/templates/default/site.conf.sample
similarity index 100%
rename from meta-poky/conf/site.conf.sample
rename to meta-poky/conf/templates/default/site.conf.sample