diff --git a/meta-z/conf/bblayers.conf.sample b/meta-z/conf/bblayers.conf.sample
new file mode 100644
index 0000000..ab8c3a5
--- /dev/null
+++ b/meta-z/conf/bblayers.conf.sample
@@ -0,0 +1,24 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/import-layers/meta-openembedded/meta-oe/   \
+  ##OEROOT##/import-layers/meta-openembedded/meta-filesystems/   \
+  ##OEROOT##/import-layers/meta-openembedded/meta-networking/   \
+  ##OEROOT##/import-layers/meta-openembedded/meta-python/   \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z \
+"
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  "
diff --git a/meta-z/conf/conf-notes.txt b/meta-z/conf/conf-notes.txt
new file mode 100644
index 0000000..9b3c01a
--- /dev/null
+++ b/meta-z/conf/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+     obmc-phosphor-image
diff --git a/meta-z/conf/layer.conf b/meta-z/conf/layer.conf
new file mode 100644
index 0000000..790dc69
--- /dev/null
+++ b/meta-z/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "ibm-z"
+BBFILE_PATTERN_ibm-z = ""
diff --git a/meta-z/conf/local.conf.sample b/meta-z/conf/local.conf.sample
new file mode 100644
index 0000000..988416f
--- /dev/null
+++ b/meta-z/conf/local.conf.sample
@@ -0,0 +1,18 @@
+MACHINE ??= "ibm-z"
+DISTRO ?= "openbmc-phosphor"
+PACKAGE_CLASSES ?= "package_rpm"
+SANITY_TESTED_DISTROS_append ?= " *"
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+CONF_VERSION = "1"
+INHERIT += "extrausers"
diff --git a/meta-z/conf/machine/ibm-z.conf b/meta-z/conf/machine/ibm-z.conf
new file mode 100644
index 0000000..90765bd
--- /dev/null
+++ b/meta-z/conf/machine/ibm-z.conf
@@ -0,0 +1,13 @@
+MACHINE = "ibm-z"
+KERNEL_DEVICETREE = "fsp2.dtb"
+KBUILD_DEFCONFIG = "44x/fsp2_defconfig"
+
+require conf/machine/include/fsp2.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/ibm.inc
+
+#dummy uboot settings
+UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig"
+UBOOT_ENTRYPOINT = "0x0"
+UBOOT_LOADADDRESS = "0x0"
+