diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml
index 5f1f4d86..5d68f47b 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:latest-armhf
+        image: functions/gateway-armhf:0.6.0
         networks:
             - functions
         deploy:
diff --git a/gateway/Dockerfile.multistage.armhf b/gateway/Dockerfile.multistage.armhf
new file mode 100644
index 00000000..e60709b9
--- /dev/null
+++ b/gateway/Dockerfile.multistage.armhf
@@ -0,0 +1,29 @@
+FROM alexellis2/go-armhf:1.7.4
+
+WORKDIR /go/src/github.com/alexellis/faas/gateway
+
+COPY vendor         vendor
+
+COPY handlers       handlers
+COPY metrics        metrics
+COPY requests       requests
+COPY tests          tests
+COPY server.go      .
+COPY types          types
+COPY plugin  plugin
+
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
+
+FROM armhf/alpine:latest
+WORKDIR /root/
+
+EXPOSE 8080
+ENV http_proxy      ""
+ENV https_proxy     ""
+
+COPY --from=0 /go/src/github.com/alexellis/faas/gateway/gateway    .
+
+COPY assets     assets
+
+CMD ["./gateway"]
+