diff --git a/recipes-core/images/nmrouter-dev-image.bb b/recipes-core/images/nmrouter-dev-image.bb
new file mode 100644
index 0000000..385ed2c
--- /dev/null
+++ b/recipes-core/images/nmrouter-dev-image.bb
@@ -0,0 +1,35 @@
+require nmrouter-image.bb
+
+SUMMARY = "nmrouter image for developement only"
+
+IMAGE_FEATURES_append = " \
+                tools-debug \
+                "
+
+BENCH_TOOLS = " \
+                tcpdump \
+                lrzsz \
+                lmbench \
+                dbench \
+                memtester \
+                nbench-byte \
+                tiobench \
+                iozone3 \
+                iperf \
+                strongswan \
+               "
+
+EASY_EDITOR = " \
+                nano \
+              "
+
+BENCH_TOOLS_cortexa9hf-neon_append = " cpuburn-neon "
+BENCH_TOOLS_cortexa8hf-neon_append = " cpuburn-neon "
+
+
+IMAGE_INSTALL_append = " \
+                lrzsz \
+                ${BENCH_TOOLS} \
+                ${EASY_EDITOR} \
+                "
+
diff --git a/recipes-core/images/nmrouter-image.bb b/recipes-core/images/nmrouter-image.bb
index cfee616..1b920c8 100644
--- a/recipes-core/images/nmrouter-image.bb
+++ b/recipes-core/images/nmrouter-image.bb
@@ -1,45 +1,27 @@
 inherit core-image
 
-SUMMARY = "Test image"
+SUMMARY = "nmrouter image"
 
 KERNEL_IMAGETYPE = "uImage"
 
 IMAGE_FSTYPES_append = " tar.gz "
 
-IMAGE_FEATURES_append = " \
-                tools-debug \
-                "
-
 IMAGE_FEATURES_append = " \
                 package-management \
                 ssh-server-openssh \
                 "
 
-BENCH_TOOLS = " \
-                tcpdump \
-                lrzsz \
-                lmbench \
-                dbench \
-                memtester \
-                nbench-byte \
-                tiobench \
-                iozone3 \
-                iperf \
-                strongswan \
-               "
-
-EASY_EDITOR = " \
-                nano \
-              "
-
-BENCH_TOOLS_cortexa9hf-neon_append = " cpuburn-neon "
-BENCH_TOOLS_cortexa8hf-neon_append = " cpuburn-neon "
-
 PREFERED_VERSION-pn_nodejs = "4.4.5"
 
-IMAGE_INSTALL_append = " \
-                linux-firmware \
+FIRMWARE ?= "linux-firmware"
+FIRMWARE_am335x-nbhw16 = " \
+                linux-firmware-ath6k \
                 linux-firmware-ath9k \
+                linux-firmware-wl12xx\
+                linux-firmware-wl18xx\
+                "
+
+IMAGE_INSTALL_append = " \
                 hostapd \
                 iw \
                 crda \
@@ -48,22 +30,18 @@ IMAGE_INSTALL_append = " \
                 bash \
                 iproute2 \
                 ethtool \
-                i2c-tools \
-                lrzsz \
                 devmem2 \
                 openvpn \
                 iptables \
                 pciutils \
                 kernel-modules \
                 kernel-devicetree \
-                node \
                 python-subprocess \
                 networkmanager \
                 cockpit \
                 board-descriptor \
                 sw-update \
-                ${BENCH_TOOLS} \
-                ${EASY_EDITOR} \
+                ${FIRMWARE} \
                 "
 
 IMAGE_INSTALL_cortex9hf-neon_append = " kernel-devicetree "
diff --git a/recipes-core/images/nmrouter-minimal.bb b/recipes-core/images/nmrouter-minimal.bb
index 2ac523d..1425381 100644
--- a/recipes-core/images/nmrouter-minimal.bb
+++ b/recipes-core/images/nmrouter-minimal.bb
@@ -1,20 +1,23 @@
-inherit core-image
+DISTRO_FEATURES_BACKFILL_CONSIDERED = " wifi bluetooth"
+
+inherit image
 
 SUMMARY = "Minimal image for bringup"
 
-IMAGE_FEATURES += " \
-                package-management \
-                ssh-server-openssh \
-                "
+#IMAGE_FEATURES += " \
+#                "
 
-IMAGE_INSTALL += " \
-                openssh-sftp-server \
-                bash \
-                ethtool \
-                i2c-tools \
-                lrzsz \
-                devmem2 \
-                "
+#IMAGE_INSTALL += " \
+#                lrzsz \
+#                devmem2 \
+#                "
 
+
+IMAGE_INSTALL = " \
+    packagegroup-core-boot \
+    e2fsprogs \
+    lrzsz \
+    devmem2 \
+    "
 LICENSE = "BSD"