diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 723318d..b5e4c2c 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -242,11 +242,11 @@ winget:
 
 dockers:
   - image_templates:
-      - "ghcr.io/bsubio/cli:{{ .Tag }}"
-      - "ghcr.io/bsubio/cli:v{{ .Major }}"
-      - "ghcr.io/bsubio/cli:v{{ .Major }}.{{ .Minor }}"
-      - "ghcr.io/bsubio/cli:latest"
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-amd64"
     dockerfile: Dockerfile
+    use: buildx
+    goos: linux
+    goarch: amd64
     build_flag_templates:
       - "--pull"
       - "--label=org.opencontainers.image.created={{.Date}}"
@@ -260,6 +260,46 @@ dockers:
     extra_files:
       - LICENSE
 
+  - image_templates:
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-arm64"
+    dockerfile: Dockerfile
+    use: buildx
+    goos: linux
+    goarch: arm64
+    build_flag_templates:
+      - "--pull"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title=bsubio"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source=https://github.com/bsubio/cli"
+      - "--label=org.opencontainers.image.description=CLI for easy running heavy duty compute jobs in the cloud"
+      - "--label=org.opencontainers.image.licenses=MIT"
+      - "--platform=linux/arm64"
+    extra_files:
+      - LICENSE
+
+docker_manifests:
+  - name_template: "ghcr.io/bsubio/cli:{{ .Tag }}"
+    image_templates:
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-amd64"
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-arm64"
+
+  - name_template: "ghcr.io/bsubio/cli:v{{ .Major }}"
+    image_templates:
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-amd64"
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-arm64"
+
+  - name_template: "ghcr.io/bsubio/cli:v{{ .Major }}.{{ .Minor }}"
+    image_templates:
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-amd64"
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-arm64"
+
+  - name_template: "ghcr.io/bsubio/cli:latest"
+    image_templates:
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-amd64"
+      - "ghcr.io/bsubio/cli:{{ .Tag }}-arm64"
+
 homebrew_casks:
   - name: bsubio
     ids:
diff --git a/Dockerfile b/Dockerfile
index c2eead3..76c7f0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Copy the binary from the build
-COPY bin/bsubio /usr/local/bin/bsubio
+COPY bsubio /usr/local/bin/bsubio
 
 # Set bsubio as the entrypoint
 ENTRYPOINT ["/usr/local/bin/bsubio"]