diff --git a/build/conf/local.conf b/build/conf/local.conf
index bbd026a..5448886 100644
--- a/build/conf/local.conf
+++ b/build/conf/local.conf
@@ -1,23 +1,23 @@
 BB_NUMBER_THREADS ?= "4"
 PARALLEL_MAKE ?= "-j 4"
 PACKAGE_CLASSES ?= "package_rpm"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats"
 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"
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K \
+    HALT,/tmp,10M,1K"
 ASSUME_PROVIDED += "libsdl-native"
-CONF_VERSION = "1"
-EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+CONF_VERSION = "2"
+EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
 
-ERROR_QA_remove += "version-going-backwards"
-#WARN_QA_append += "version-going-backwards"
+ERROR_QA:remove = "version-going-backwards"
+#WARN_QA:append = "version-going-backwards"
 #https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
 
 #PRSERV_HOST = "localhost:0"
@@ -29,7 +29,7 @@ LICENSE_CREATE_PACKAGE = "1"
 
 YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
 
-PREMIRRORS_prepend = "\
+PREMIRRORS:prepend = "\
    git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
    ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
    http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
@@ -37,4 +37,3 @@ PREMIRRORS_prepend = "\
 
 require distro_version.inc
 require public-mirrors.inc
-require proprietary-dev-tools.inc
diff --git a/build/conf/proprietary-dev-tools.inc b/build/conf/proprietary-dev-tools.inc
deleted file mode 100644
index 27b737b..0000000
--- a/build/conf/proprietary-dev-tools.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# These tools are not publicly available be usually included
-# in the development image
-
-IMAGE_INSTALL_remove += "\
-                         battery-test \
-"
diff --git a/build/conf/public-mirrors.inc b/build/conf/public-mirrors.inc
index c094be4..eeeb9b9 100644
--- a/build/conf/public-mirrors.inc
+++ b/build/conf/public-mirrors.inc
@@ -1,31 +1,31 @@
 # Changing internal SRC_URI to public
 
 ## Bootloaders
-SRC_URI_pn-u-boot-ti33x = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2016.05/standard/am335x;protocol=ssh;"
-SRC_URI_pn-u-boot-armada = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2017.11/standard/armada-385;protocol=ssh;"
-SRC_URI_pn-u-boot-imx8-nmhw23 = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2018.03/imx/imx8-nmhw23;protocol=ssh"
+SRC_URI:pn-u-boot-ti33x = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2016.05/standard/am335x;protocol=ssh;"
+SRC_URI:pn-u-boot-armada = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2017.11/standard/armada-385;protocol=ssh;"
+SRC_URI:pn-u-boot-imx8-nmhw23 = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;user=git;branch=2018.03/imx/imx8-nmhw23;protocol=ssh"
 
 ## Kernel
 KERNEL_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=git;branch=5.10/standard/base;protocol=ssh"
-SRC_URI_pn-linux-netmodule = "${KERNEL_SRC}"
-SRC_URI_pn-linux-netmodule-initramfs = "${KERNEL_SRC}"
+SRC_URI:pn-linux-netmodule = "${KERNEL_SRC}"
+SRC_URI:pn-linux-netmodule-initramfs = "${KERNEL_SRC}"
 
 KERNEL_HW23_SRC = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;user=git;branch=4.14/nxp/nmhw23;protocol=ssh"
-SRC_URI_pn-linux-netmodule_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
-SRC_URI_pn-linux-netmodule-initramfs_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
+SRC_URI:pn-linux-netmodule_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
+SRC_URI:pn-linux-netmodule-initramfs_imx8-nmhw23 = "${KERNEL_HW23_SRC}"
 
 # tools
-SRC_URI_pn-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
-SRC_URI_pn-sys-mon-native = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
-SRC_URI_pn-nativesdk-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
-SRC_URI_pn-libnmapp = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh"
-SRC_URI_pn-libnmapp-native = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh"
-SRC_URI_pn-nativesdk-libnmapp = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh"
+SRC_URI:pn-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+SRC_URI:pn-sys-mon-native = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+SRC_URI:pn-nativesdk-sys-mon = "git://gitlab.com/netmodule/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+SRC_URI:pn-libnmapp = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh"
+SRC_URI:pn-libnmapp-native = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh"
+SRC_URI:pn-nativesdk-libnmapp = "git://gitlab.com/netmodule/tools/libnmapp.git;user=git;branch=develop;protocol=ssh"
 
 # Removing AUTOREV from uneeded recipes pointing to internal repos
 ## distro layer
-SRCREV_pn-battery-test = "0"
+SRCREV:pn-battery-test = "0"
 
 ## bsp layer
-SRCREV_pn-dt-overlay = "0"
+SRCREV:pn-dt-overlay = "0"
 
diff --git a/build/conf/release_revisions.inc b/build/conf/release_revisions.inc
index 4a39eb7..11e0733 100644
--- a/build/conf/release_revisions.inc
+++ b/build/conf/release_revisions.inc
@@ -1,29 +1,29 @@
 # bootloader and similar parts
-SRCREV_pn-u-boot-imx8-nmhw23 = "5cdce0ed934bd2c536412687fda4fa8d7b8fc2c1"
-SRCREV_pn-u-boot-am335x-nrhw20-v1 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
-SRCREV_pn-u-boot-am335x-nmhw24 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
-SRCREV_pn-u-boot-am335x-nmhw21 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
-SRCREV_pn-u-boot-am335x-hw25 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
-SRCREV_pn-imx-boot = "dd0234001713623c79be92b60fa88bc07b07f24f"
-SRCREV_pn-imx-atf = "413e93e10ee4838e9a68b190f1468722f6385e0e"
-SRCREV_pn-bootloader-config = "c673f5ea95ac128e1f28072af9e3d6737a64ca31"
+SRCREV:pn-u-boot-imx8-nmhw23 = "5cdce0ed934bd2c536412687fda4fa8d7b8fc2c1"
+SRCREV:pn-u-boot-am335x-nrhw20-v1 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
+SRCREV:pn-u-boot-am335x-nmhw24 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
+SRCREV:pn-u-boot-am335x-nmhw21 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
+SRCREV:pn-u-boot-am335x-hw25 = "3a9ef955c25ef83caa92eebcceeda2252df0ef34"
+SRCREV:pn-imx-boot = "dd0234001713623c79be92b60fa88bc07b07f24f"
+SRCREV:pn-imx-atf = "413e93e10ee4838e9a68b190f1468722f6385e0e"
+SRCREV:pn-bootloader-config = "c673f5ea95ac128e1f28072af9e3d6737a64ca31"
 # common parts
-SRCREV_pn-glibc = "f84949f1c4bbf20e6a1d9a5859cf012cde060ede"
-SRCREV_pn-gnss-mgr = "f48c652849be55625bd430b6fa9aa282cbd2a735"
-SRCREV_pn-gpsd = "7c962c4a38caf807c5be1ee008163a33a42e1d26"
-SRCREV_pn-json2textlog = "8dd3c4896bfe1d738594c19377dcf089a51f2271"
-SRCREV_pn-libnmapp = "2efe9683f3500b070f90a744a191a87716d70597"
-SRCREV_pn-libnmapp-native = "2efe9683f3500b070f90a744a191a87716d70597"
-SRCREV_pn-modemmanager = "35ef2f387bf53f0601901a5f08ab0f6bf57105c4"
-SRCREV_pn-nmhw-fwupdate = "3fdaacd31b48d77ae3f3404975fd14bc1d638e60"
-SRCREV_pn-nmubxlib = "67bf3ae1a20b34806b678d4ca6eb31fa491642a1"
-SRCREV_pn-scripts-nm = "9391209e44f1e47030a180b05e4af19b11ee03a8"
-SRCREV_pn-speedtest-cli = "42e96b13dda2afabbcec2622612d13495a415caa"
-SRCREV_pn-ssc-broker-driver = "e6c704fe4f8a92004b2b1c3b80c28459549a9f9c"
-SRCREV_pn-ssc-extmod-driver = "5fe9df71b7c4489f7b016eb820f53a06e22b4ae2"
-SRCREV_pn-ssc-sysstate-driver = "1a7f52a4bfc2e2d5fb4f90e2e2086865196afbc3"
-SRCREV_pn-sys-mon = "9391209e44f1e47030a180b05e4af19b11ee03a8"
-SRCREV_pn-sys-mon-native = "9391209e44f1e47030a180b05e4af19b11ee03a8"
-SRCREV_pn-udev-rules-nmhw = "ff36bf86011c2d224695c2121a3adb7160dc2b3f"
-SRCREV_pn-wlconf-bin = "cf9bfca0a80f02eb4a4245ab0144f8e956e24b95"
-SRCREV_pn-wwan-config = "17c5e33adb2dbfe3675e5999a881b1092e86d40c"
+SRCREV:pn-glibc = "f84949f1c4bbf20e6a1d9a5859cf012cde060ede"
+SRCREV:pn-gnss-mgr = "f48c652849be55625bd430b6fa9aa282cbd2a735"
+SRCREV:pn-gpsd = "7c962c4a38caf807c5be1ee008163a33a42e1d26"
+SRCREV:pn-json2textlog = "8dd3c4896bfe1d738594c19377dcf089a51f2271"
+SRCREV:pn-libnmapp = "2efe9683f3500b070f90a744a191a87716d70597"
+SRCREV:pn-libnmapp-native = "2efe9683f3500b070f90a744a191a87716d70597"
+SRCREV:pn-modemmanager = "35ef2f387bf53f0601901a5f08ab0f6bf57105c4"
+SRCREV:pn-nmhw-fwupdate = "3fdaacd31b48d77ae3f3404975fd14bc1d638e60"
+SRCREV:pn-nmubxlib = "67bf3ae1a20b34806b678d4ca6eb31fa491642a1"
+SRCREV:pn-scripts-nm = "9391209e44f1e47030a180b05e4af19b11ee03a8"
+SRCREV:pn-speedtest-cli = "42e96b13dda2afabbcec2622612d13495a415caa"
+SRCREV:pn-ssc-broker-driver = "e6c704fe4f8a92004b2b1c3b80c28459549a9f9c"
+SRCREV:pn-ssc-extmod-driver = "5fe9df71b7c4489f7b016eb820f53a06e22b4ae2"
+SRCREV:pn-ssc-sysstate-driver = "1a7f52a4bfc2e2d5fb4f90e2e2086865196afbc3"
+SRCREV:pn-sys-mon = "9391209e44f1e47030a180b05e4af19b11ee03a8"
+SRCREV:pn-sys-mon-native = "9391209e44f1e47030a180b05e4af19b11ee03a8"
+SRCREV:pn-udev-rules-nmhw = "ff36bf86011c2d224695c2121a3adb7160dc2b3f"
+SRCREV:pn-wlconf-bin = "cf9bfca0a80f02eb4a4245ab0144f8e956e24b95"
+SRCREV:pn-wwan-config = "17c5e33adb2dbfe3675e5999a881b1092e86d40c"
diff --git a/env.common b/env.common
index 18ec83c..cdf1433 100644
--- a/env.common
+++ b/env.common
@@ -15,6 +15,6 @@ echo Building for machine $MACHINE, distro: $DISTRO
 
 OSTREE_OSNAME=nm-linux
 
-BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE_TYPE DISTRO_OSTREE DISTRO_TYPE"
+BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONSMACHINE_TYPE DISTRO_OSTREE DISTRO_TYPE"
 
 . ./openembedded-core/oe-init-build-env