diff --git a/.docker-images b/.docker-images
index a11df848..58019909 100644
--- a/.docker-images
+++ b/.docker-images
@@ -2,7 +2,7 @@ images:
   - name: cloudflared
     dockerfile: Dockerfile
     context: .
-    verions:
+    versions:
     - latest
     registries:
     - name: docker.io/cloudflare
diff --git a/Makefile b/Makefile
index a6081d0c..a17f789f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,9 @@ ifeq ($(EQUINOX_IS_DRAFT), true)
 endif
 
 LOCAL_ARCH ?= $(shell uname -m)
-ifeq ($(LOCAL_ARCH),x86_64)
+ifneq ($(GOARCH),)
+    TARGET_ARCH ?= $(GOARCH)
+else ifeq ($(LOCAL_ARCH),x86_64)
     TARGET_ARCH ?= amd64
 else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 5),armv8)
     TARGET_ARCH ?= arm64
diff --git a/cfsetup.yaml b/cfsetup.yaml
index f2d4d7e8..a15f1e82 100644
--- a/cfsetup.yaml
+++ b/cfsetup.yaml
@@ -29,6 +29,7 @@ stretch: &stretch
       - build-essential
       - fakeroot
       - rubygem-fpm
+      - openssh-client
     post-cache:
       - export GOOS=linux
       - export GOARCH=amd64