diff --git a/Makefile b/Makefile
index 31b38a9a..98bcd1c7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,5 +7,9 @@ build-gateway:
 	(cd gateway; ./build.sh latest-dev)
 test-ci:
 	./contrib/ci.sh
-ci-armhf:
-	(cd gateway; ./build.sh $(TAG)-armhf)
+
+ci-armhf-build:
+	(cd gateway; ./build.sh $(TAG))
+
+ci-armhf-push:
+	(cd gateway; ./push.sh $(TAG))
diff --git a/gateway/push.sh b/gateway/push.sh
new file mode 100644
index 00000000..5f9bb87d
--- /dev/null
+++ b/gateway/push.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+export arch=$(uname -m)
+
+export eTAG="latest-dev"
+
+if [ "$arch" = "armv7l" ] ; then
+   eTAG="latest-armhf-dev"
+fi
+
+echo "$1"
+if [ "$1" ] ; then
+  eTAG=$1
+  if [ "$arch" = "armv7l" ] ; then
+    eTAG="$1-armhf"
+  fi
+fi
+
+echo Pushing openfaas/gateway:$eTAG
+
+docker push openfaas/gateway:$eTAG
+