diff --git a/.gitmodules b/.gitmodules
index 47c75d1..bf7b77c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
 [submodule "bitbake"]
 	path = bitbake
 	url = git://git.openembedded.org/bitbake.git
-	branch = 1.42
+	branch = 1.46
 [submodule "openembedded-core"]
 	path = openembedded-core
 	url = git://git.openembedded.org/openembedded-core
-	branch = warrior
+	branch = dunfell
 [submodule "meta-openembedded"]
 	path = meta-openembedded
 	url = git://git.openembedded.org/meta-openembedded
-	branch = warrior
+	branch = dunfell
 [submodule "meta-updater"]
 	path = meta-updater
 	url = https://github.com/advancedtelematic/meta-updater.git
-	branch = warrior
+	branch = dunfell
 [submodule "meta-netmodule-bsp"]
 	path = meta-netmodule-bsp
 	url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-bsp.git
-	branch = warrior
+	branch = develop
 [submodule "meta-netmodule-distro"]
 	path = meta-netmodule-distro
 	url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-distro.git
-	branch = warrior
+	branch = develop
 [submodule "meta-netmodule-wlan"]
 	path = meta-netmodule-wlan
 	url = git@gitlab.com:netmodule/yoctoproject/meta-netmodule-wlan.git
diff --git a/bitbake b/bitbake
index b4860b2..a394eee 160000
--- a/bitbake
+++ b/bitbake
@@ -1 +1 @@
-Subproject commit b4860b292406698f3c8af9a3708a09df21c96300
+Subproject commit a394eeec6aeb98c6395cb5da2036ce936bdaa0a0
diff --git a/build/conf/distro_version.inc b/build/conf/distro_version.inc
new file mode 100644
index 0000000..301a184
--- /dev/null
+++ b/build/conf/distro_version.inc
@@ -0,0 +1 @@
+DISTRO_VERSION = "1.1.5"
diff --git a/build/conf/local.conf b/build/conf/local.conf
index a8cafef..de91855 100644
--- a/build/conf/local.conf
+++ b/build/conf/local.conf
@@ -35,7 +35,7 @@ PREMIRRORS_prepend = "\
    http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
    https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
 
-include distro_version.inc
-include release_revisions.inc
-include public-mirrors.inc
-include proprietary-dev-tools.inc
+require distro_version.inc
+require release_revisions.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
index 70cea5e..27b737b 100644
--- a/build/conf/proprietary-dev-tools.inc
+++ b/build/conf/proprietary-dev-tools.inc
@@ -1,7 +1,6 @@
 # These tools are not publicly available be usually included
 # in the development image
 
-IMAGE_INSTALL_remove += "scripts-nm \
-                         sys-mon \
+IMAGE_INSTALL_remove += "\
                          battery-test \
 "
diff --git a/build/conf/public-mirrors.inc b/build/conf/public-mirrors.inc
index 1ab209b..4f838b9 100644
--- a/build/conf/public-mirrors.inc
+++ b/build/conf/public-mirrors.inc
@@ -10,13 +10,26 @@ SRC_URI_pn-u-boot-am335x-hw25 = "${UBOOT_TI_SRC}"
 
 SRC_URI_pn-u-boot-armada-385-nrhw18-v2 = "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-mek;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=4.19/standard/base;protocol=ssh"
 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}"
+
+# sys-mon
+SRC_URI_pn-scripts-nm = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-json2textlog = "git://gitlab.com/netmodule/tools/json2textlog.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-sys-mon = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-sys-mon-native = "git://gitlab.com/netmodule/tools/features.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-nativesdk-sys-mon = "git://gitlab.com/netmodule/tools/features.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
diff --git a/build/conf/release_revisions.inc b/build/conf/release_revisions.inc
index 2d8748f..47e5173 100644
--- a/build/conf/release_revisions.inc
+++ b/build/conf/release_revisions.inc
@@ -1,25 +1,33 @@
-SRCREV_pn-linux-netmodule = "4683b46a6d736f0d67db8a5a3bb1dfe645f13c82"
-SRCREV_pn-linux-netmodule-initramfs = "4683b46a6d736f0d67db8a5a3bb1dfe645f13c82"
+SRCREV_pn-linux-netmodule = "4c9e1433ae0134c99f092b769056445b2bb7ca9b"
+SRCREV_pn-linux-netmodule-initramfs = "4c9e1433ae0134c99f092b769056445b2bb7ca9b"
 # HW23
-SRCREV_pn-linux-netmodule_imx8-nmhw23 = "22f9c3c6448cbfafb5e7a1bf539ba7ba688fde7d"
-SRCREV_pn-linux-netmodule-initramfs_imx8_nmhw23 = "22f9c3c6448cbfafb5e7a1bf539ba7ba688fde7d"
+SRCREV_pn-linux-netmodule_imx8-nmhw23 = "30dffcdddfad814529afc0d2b4b1f95b5d94c374"
+SRCREV_pn-linux-netmodule-initramfs_imx8-nmhw23 = "30dffcdddfad814529afc0d2b4b1f95b5d94c374"
 
 SRCREV_pn-u-boot-am335x-nrhw20-v1 = "e8475b4f809c25f22e2be74b98661568ac8c06e0"
 SRCREV_pn-u-boot-am335x-nmhw21 = "e8475b4f809c25f22e2be74b98661568ac8c06e0"
-SRCREV_pn-u-boot-imx8-nmhw23 = "7f6a031a0806f9a18976373d3988031cb2934277"
 SRCREV_pn-u-boot-am335x-nmhw24 = "e8475b4f809c25f22e2be74b98661568ac8c06e0"
 SRCREV_pn-u-boot-am335x-hw25 = "e8475b4f809c25f22e2be74b98661568ac8c06e0"
+SRCREV_pn-u-boot-imx8-nmhw23 = "ec54da360debfc2d1318a5d49dad590ce424b3dd"
 
 SRCREV_pn-imx-boot = "dd0234001713623c79be92b60fa88bc07b07f24f"
 SRCREV_pn-imx-atf = "413e93e10ee4838e9a68b190f1468722f6385e0e"
 
 SRCREV_pn-nmhw-fwupdate = "029491bec8c971195af208da8687a4661bf90e2b"
 SRCREV_pn-bootloader-config = "e45c8d44451bd8b8b8987eb4330095359eddcf84"
-SRCREV_pn-gnss-mgr = "98e82bbb97a7852c9b1723f2187b80aeec7ee7c3"
+SRCREV_pn-gnss-mgr = "ba2e7a05c0e919cc177056ccc2e14db447790862"
 SRCREV_pn-udev-rules-nmhw = "f7969eaac9cc9db546295f185b2b7e54cc409da9"
-SRCREV_pn-nmubxlib = "745231869cafe4ad00a4be4273684f6ed4fc4006"
+SRCREV_pn-nmubxlib = "67bf3ae1a20b34806b678d4ca6eb31fa491642a1"
 SRCREV_pn-wlconf-bin = "cf9bfca0a80f02eb4a4245ab0144f8e956e24b95"
-SRCREV_pn-wwan-config = "bb7051835245d8f1b51792757bc1c7aa29416d1f"
-SRCREV_pn-modemmanager = "fb94f003f5c03eafd2c62ac977e536d6489ad6b3"
+SRCREV_pn-wwan-config = "ff6ae5f45b2bef06c20061d7a02038764f625dce"
+SRCREV_pn-modemmanager = "85f37de4f1aeb3f38c5a922aa91256690a5b7739"
 SRCREV_pn-speedtest-cli = "c58ad3367bf27f4b4a4d5b1bca29ebd574731c5d"
-SRCREV_pn-gpsd = "ed1babcb32b5d8ac5989c9b76f3691570e12fad5"
+SRCREV_pn-gpsd = "7c962c4a38caf807c5be1ee008163a33a42e1d26"
+SRCREV_pn-scripts-nm = "97ca2d5bfd02517f586734e9783ef987a52bfab5"
+SRCREV_pn-json2textlog = "8dd3c4896bfe1d738594c19377dcf089a51f2271"
+SRCREV_pn-sys-mon = "97ca2d5bfd02517f586734e9783ef987a52bfab5"
+SRCREV_pn-sys-mon-native = "97ca2d5bfd02517f586734e9783ef987a52bfab5"
+SRCREV_pn-nativesdk-sys-mon = "97ca2d5bfd02517f586734e9783ef987a52bfab5"
+SRCREV_pn-libnmapp = "f1b3d1f8328f62556fc67bb7ef174cd215d674fd"
+SRCREV_pn-libnmapp-native = "f1b3d1f8328f62556fc67bb7ef174cd215d674fd"
+SRCREV_pn-nativesdk-libnmapp = "f1b3d1f8328f62556fc67bb7ef174cd215d674fd"
diff --git a/meta-netmodule-bsp b/meta-netmodule-bsp
index 2680c89..b034539 160000
--- a/meta-netmodule-bsp
+++ b/meta-netmodule-bsp
@@ -1 +1 @@
-Subproject commit 2680c89a0897af4fd820ec074176445a62f4a863
+Subproject commit b034539375e136067dcdb1b44db62036466ed020
diff --git a/meta-netmodule-distro b/meta-netmodule-distro
index 18b81ba..b11110c 160000
--- a/meta-netmodule-distro
+++ b/meta-netmodule-distro
@@ -1 +1 @@
-Subproject commit 18b81bac4847990cddfbdf7c69812ec2c6ba83d8
+Subproject commit b11110c51ad826fe4a8ea66baaa37bb165dd6581
diff --git a/meta-netmodule-wlan b/meta-netmodule-wlan
index 7c47a33..912946d 160000
--- a/meta-netmodule-wlan
+++ b/meta-netmodule-wlan
@@ -1 +1 @@
-Subproject commit 7c47a3374fe36b10c017746db8cb5dc651290e9d
+Subproject commit 912946d115923323953536452322d98b04a2fdf0
diff --git a/meta-openembedded b/meta-openembedded
index a24acf9..5bba794 160000
--- a/meta-openembedded
+++ b/meta-openembedded
@@ -1 +1 @@
-Subproject commit a24acf94d48d635eca668ea34598c6e5c857e3f8
+Subproject commit 5bba79488b7d393d2258d6e917f7bf7b0d7c4073
diff --git a/meta-updater b/meta-updater
index 0d5c911..b1bb00f 160000
--- a/meta-updater
+++ b/meta-updater
@@ -1 +1 @@
-Subproject commit 0d5c911120c02f0851e497f1fde02f515e557e3e
+Subproject commit b1bb00f4b645e7ab5cf6af4a6579df8b0f24e079
diff --git a/openembedded-core b/openembedded-core
index 856674d..8978222 160000
--- a/openembedded-core
+++ b/openembedded-core
@@ -1 +1 @@
-Subproject commit 856674d6f75e2b99ae961d5ab869ff071ff5c362
+Subproject commit 897822233faef0f8f35dc1d8a39e1c4bc0550f1e