diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f8f11dcc..9fce04593 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
           file: Dockerfile
           context: .
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           # if tag is an empty string, plugin will skip that tag.
           tags: |
             ${{ env.ORG }}/${{ env.BDJUNO_IMAGE_NAME }}:latest
diff --git a/Dockerfile b/Dockerfile
index 6c2986977..cd55bff97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM --platform=$TARGETPLATFORM alpine:latest
 WORKDIR /bdjuno
 RUN apk update
 RUN apk add postgresql
-COPY ./bin/.cache/bdjuno/docker.linux.amd64/bin/bdjuno /usr/bin/bdjuno
+COPY ./bin/.cache/bdjuno/docker.$TARGETOS.$TARGETARCH/bin/bdjuno /usr/bin/bdjuno
 COPY database/schema /var/lib/postgresql/schema
 RUN chmod a+rx /var/lib/postgresql && \
     chmod a+rx /var/lib/postgresql/schema