diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml
index 6026f405..12c9b4a1 100644
--- a/docker-compose.armhf.yml
+++ b/docker-compose.armhf.yml
@@ -7,7 +7,7 @@ services:
             - "/var/run/docker.sock:/var/run/docker.sock"
         ports:
             - 8080:8080
-        image: functions/gateway:0.6.7-armhf
+        image: functions/gateway:0.6.9-armhf
         networks:
             - functions
         deploy:
diff --git a/docker-compose.extended.armhf.yml b/docker-compose.extended.armhf.yml
index 95dcab1a..4bb0244a 100644
--- a/docker-compose.extended.armhf.yml
+++ b/docker-compose.extended.armhf.yml
@@ -1,11 +1,11 @@
-version: "3.2"
+version: "3.3"
 services:
     gateway:
         volumes:
             - "/var/run/docker.sock:/var/run/docker.sock"
         ports:
             - 8080:8080
-        image: functions/gateway:0.6.7-armhf
+        image: functions/gateway:0.6.9-armhf
         networks:
             - functions
         environment:
@@ -40,7 +40,7 @@ services:
                     - 'node.platform.os == linux'
 
     queue-worker:
-        image: alexellis2/nats-queue-worker:0.1-armhf
+        image: functions/queue-worker:0.2-armhf
         networks:
             - functions
         deploy:
@@ -53,6 +53,8 @@ services:
                 constraints:
                     - 'node.platform.os == linux'
 
+# --
+
     prometheus:
         image: alexellis2/prometheus-armhf:1.5.2
         volumes:
@@ -90,9 +92,8 @@ services:
             placement:
                 constraints: [node.role == manager]
 
-# sample functions go here, but can be created in the UI too.
-    nodeinfo:
-        image: functions/nodeinfo:latest-armhf
+    markdown:
+        image: functions/markdownrender:latest-armhf
         labels:
             function: "true"
         depends_on:
@@ -103,8 +104,7 @@ services:
             no_proxy:   "gateway"
             https_proxy: $https_proxy
 
-
 networks:
     functions:
         driver: overlay
-        #attachable: true
+        attachable: true
diff --git a/sample-functions/AlpineFunction/Dockerfile.armhf b/sample-functions/AlpineFunction/Dockerfile.armhf
index 463b0c15..1f4d5409 100644
--- a/sample-functions/AlpineFunction/Dockerfile.armhf
+++ b/sample-functions/AlpineFunction/Dockerfile.armhf
@@ -1,6 +1,6 @@
-FROM arm32v6/alpine:3.6
+FROM alpine:3.6
 
-ADD https://github.com/openfaas/faas/releases/download/0.6.0/fwatchdog-armhf /usr/bin/fwatchdog
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog-armhf /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 
 # Populate example here