diff --git a/gateway/Dockerfile.multistage.armhf b/gateway/Dockerfile.armhf
similarity index 100%
rename from gateway/Dockerfile.multistage.armhf
rename to gateway/Dockerfile.armhf
diff --git a/gateway/Dockerfile.build.armhf b/gateway/Dockerfile.build.armhf
deleted file mode 100644
index 8583a3ae..00000000
--- a/gateway/Dockerfile.build.armhf
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alexellis2/go-armhf:1.7.4
-
-RUN go get -d github.com/docker/docker/api/types \
-   && go get -d github.com/docker/docker/api/types/filters \
-   && go get -d github.com/docker/docker/api/types/swarm \
-   && go get -d github.com/docker/docker/client \
-   && go get github.com/gorilla/mux \
-   && go get github.com/prometheus/client_golang/prometheus
-RUN go get -d github.com/Sirupsen/logrus
-
-WORKDIR /go/src/github.com/alexellis/faas/gateway
-
-COPY metrics        metrics
-COPY requests       requests
-COPY tests          tests
-COPY handlers       handlers
-
-COPY server.go      .
-COPY types          types
-
-RUN go test -v ./tests && \
-    CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .