diff --git a/conf/bblayers.conf-sample b/conf/bblayers.conf-sample
deleted file mode 100644
index 7394b32b..00000000
--- a/conf/bblayers.conf-sample
+++ /dev/null
@@ -1,16 +0,0 @@
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ${HOME}/poky-krogoth/meta \
-  ${HOME}/poky-krogoth/meta-poky \
-  ${HOME}/poky-krogoth/meta-openembedded/meta-oe \
-  ${HOME}/poky-krogoth/meta-openembedded/meta-networking \
-  ${HOME}/poky-krogoth/meta-openembedded/meta-python \
-  ${HOME}/poky-krogoth/meta-qt5 \
-  ${HOME}/bbb/meta-bbb \
-  "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
new file mode 100644
index 00000000..8fe99ae3
--- /dev/null
+++ b/conf/bblayers.conf.sample
@@ -0,0 +1,16 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-qt5 \
+  ##OEROOT##/meta-bbb \
+  "
diff --git a/conf/conf-notes.txt b/conf/conf-notes.txt
new file mode 100644
index 00000000..eaf24ae7
--- /dev/null
+++ b/conf/conf-notes.txt
@@ -0,0 +1,8 @@
+Common targets are:
+    console-image
+    can-console-image
+    installer-image
+    qt5-image
+    qt5-x11-image
+    x11-image
+
diff --git a/conf/local.conf-x11-sample b/conf/local.conf-x11.sample
similarity index 100%
rename from conf/local.conf-x11-sample
rename to conf/local.conf-x11.sample
diff --git a/conf/local.conf-sample b/conf/local.conf.sample
similarity index 100%
rename from conf/local.conf-sample
rename to conf/local.conf.sample