4 files changed, 17 insertions, 11 deletions
diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index 35a58a9..6423237 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -51,6 +51,7 @@ MULTITECH_FEATURES += " \
 					 reset-handler \
 					 radio-cmd radio-query \
 					 jsparser \
+                     annex-client \
                      "
 
 MISC_FEATURES = "minicom lrzsz nano rs9113"
diff --git a/recipes-core/images/mlinux-mtcap-debug-image.bb b/recipes-core/images/mlinux-mtcap-debug-image.bb
new file mode 100644
index 0000000..48009ae
--- /dev/null
+++ b/recipes-core/images/mlinux-mtcap-debug-image.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "mLinux Conduit Access Point debug image"
+
+require mlinux-mtcap-image.bb
+
+# Extra stuff to install
+IMAGE_INSTALL += "lora-network-server-mtcap \
+                  lora-gateway-utils \
+                  lora-query \
+                  mosquitto mosquitto-clients \
+                  nodejs \
+                  nodejs-npm \
+                  "
+
diff --git a/recipes-core/images/mlinux-picocell-image.bb b/recipes-core/images/mlinux-mtcap-image.bb
index 49670a9..610fe08 100644
--- a/recipes-core/images/mlinux-picocell-image.bb
+++ b/recipes-core/images/mlinux-mtcap-image.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "mLinux PicoCell image"
+DESCRIPTION = "mLinux Conduit Access Point image"
 
 require mlinux-minimal-image.bb
 
@@ -32,6 +32,8 @@ MULTITECH_FEATURES += " \
                  reset-handler \
                  radio-cmd radio-query \
                  jsparser \
+                 protobuf \
+                 annex-client \
                  "
 
 LORA_FEATURES = "lora-packet-forwarder \
diff --git a/recipes-core/images/mlinux-picocell-debug-image.bb b/recipes-core/images/mlinux-picocell-debug-image.bb
deleted file mode 100644
index 9ae7ea7..0000000
--- a/recipes-core/images/mlinux-picocell-debug-image.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "mLinux PicoCell debug image"
-
-require mlinux-picocell-image.bb
-
-# Extra stuff to install
-IMAGE_INSTALL += "lora-network-server-mtp \
-                  lora-gateway-utils \
-                  lora-query \
-                  mosquitto mosquitto-clients"
-