diff --git a/.zuul.yaml b/.zuul.yaml
index 64133a7..bbc34ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,9 @@
       docker_images:
         - context: .
           repository: vexxhost/node-labeler
+          arch:
+            - linux/amd64
+            - linux/arm64
 
 - job:
     name: node-labeler:image:upload
diff --git a/Dockerfile b/Dockerfile
index 7a99162..ab0efbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
 FROM golang:1.13 AS builder
 WORKDIR /go/src/app
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build
+RUN CGO_ENABLED=0 GOOS=linux go build
 
-FROM scratch
+# NOTE(mnaser): https://github.com/containers/skopeo/issues/991
+# FROM scratch
+FROM debian:stable-slim
 COPY --from=builder /go/src/app/node-labeler /node-labeler
-ENTRYPOINT ["/node-labeler"]
\ No newline at end of file
+ENTRYPOINT ["/node-labeler"]