diff --git a/docker-compose.yml b/docker-compose.yml
index fa79845..c570e12 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,14 +3,14 @@ version: '2'
 services:
 
   gateway-config:
-    image: nebraltd/hm-config:arm64-69abf28
+    image: nebraltd/hm-config:arm64-4ea0854
     depends_on:
       - dbus-session
       - helium-miner
       - diagnostics
     environment:
-      - FIRMWARE_VERSION=v1.0.2-18
-      - FIRMWARE_SHORT_HASH=f5f7da0
+      - FIRMWARE_VERSION=v1.0.2-21
+      - FIRMWARE_SHORT_HASH=44eefce
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
       - DBUS_SESSION_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
     restart: on-failure
@@ -37,8 +37,8 @@ services:
       - pktfwdr:/var/pktfwd
       - nebra:/var/nebra
     environment:
-      - FIRMWARE_VERSION=v1.0.2-18
-      - FIRMWARE_SHORT_HASH=f5f7da0
+      - FIRMWARE_VERSION=v1.0.2-21
+      - FIRMWARE_SHORT_HASH=44eefce
     labels:
       io.balena.features.sysfs: 1
       io.balena.features.procfs: 1
@@ -54,13 +54,13 @@ services:
     volumes:
       - nebra:/var/nebra
     environment:
-      - FIRMWARE_VERSION=v1.0.2-18
-      - FIRMWARE_SHORT_HASH=f5f7da0
+      - FIRMWARE_VERSION=v1.0.2-21
+      - FIRMWARE_SHORT_HASH=44eefce
     expose:
       - "1681"
 
   helium-miner:
-    image: nebraltd/hm-gatewayrs:arm64-8bd20f9
+    image: nebraltd/hm-gatewayrs:arm64-f862556
     depends_on:
       - diagnostics
     cap_add:
@@ -73,21 +73,21 @@ services:
     ports:
       - "44158:44158/tcp"
     environment:
-      - FIRMWARE_VERSION=v1.0.2-18
-      - FIRMWARE_SHORT_HASH=f5f7da0
+      - FIRMWARE_VERSION=v1.0.2-21
+      - FIRMWARE_SHORT_HASH=44eefce
     volumes:
       - pktfwdr:/var/pktfwd
       - miner-storage:/var/data
       - nebra:/var/nebra
 
   diagnostics:
-    image: nebraltd/hm-diag:arm64-f67a928
+    image: nebraltd/hm-diag:arm64-3af453b
     depends_on:
       - dbus-session
     environment:
-      - FIRMWARE_VERSION=v1.0.2-18
-      - FIRMWARE_SHORT_HASH=f5f7da0
-      - DIAGNOSTICS_VERSION=f67a928
+      - FIRMWARE_VERSION=v1.0.2-21
+      - FIRMWARE_SHORT_HASH=44eefce
+      - DIAGNOSTICS_VERSION=3af453b
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
     volumes:
       - pktfwdr:/var/pktfwd
@@ -114,8 +114,8 @@ services:
       - dbus:/session/dbus
     environment:
       - DBUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
-      - FIRMWARE_VERSION=v1.0.2-18
-      - FIRMWARE_SHORT_HASH=f5f7da0
+      - FIRMWARE_VERSION=v1.0.2-21
+      - FIRMWARE_SHORT_HASH=44eefce
 
 volumes:
   miner-storage: