diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml
index 899a2c65..9773ffb2 100644
--- a/docker-compose.arm64.yml
+++ b/docker-compose.arm64.yml
@@ -5,7 +5,7 @@ services:
             - "/var/run/docker.sock:/var/run/docker.sock"
         ports:
             - 8080:8080
-        image: functions/gateway:arm64-0.6.6-beta2
+        image: functions/gateway:0.6.9-arm64
         networks:
             - functions
         environment:
diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64
index 34abb09c..f6710ba1 100644
--- a/gateway/Dockerfile.arm64
+++ b/gateway/Dockerfile.arm64
@@ -1,5 +1,5 @@
 FROM alexellis2/golang:1.9-arm64 as build
-WORKDIR /go/src/github.com/alexellis/faas/gateway
+WORKDIR /go/src/github.com/openfaas/faas/gateway
 ENV GOPATH=/go
 
 COPY vendor         vendor
@@ -23,7 +23,7 @@ EXPOSE 8080
 ENV http_proxy      ""
 ENV https_proxy     ""
 
-COPY --from=build /go/src/github.com/alexellis/faas/gateway/gateway    .
+COPY --from=build /go/src/github.com/openfaas/faas/gateway/gateway    .
 
 COPY assets     assets