diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index 68548df..ff9e934 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -26,6 +26,12 @@ jobs:
       - name: Test Go application
         run: go test ./...
 
+       - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Docker Login
         uses: docker/login-action@v3.1.0
         with:
@@ -40,5 +46,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}-${{ github.run_id }}
+
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 18f033b..e918046 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,3 +1,7 @@
+version: 2
+project_name: web-jwks-validator
+
+
 before:
   hooks:
     - go mod download
@@ -12,6 +16,11 @@ builds:
       - darwin
     goarch:
       - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
     main: ./
     binary: web-jwks-validator
 
@@ -39,4 +48,5 @@ dockers:
       - "--label=org.opencontainers.image.source={{ .GitURL }}"
       - "--platform=linux/amd64"
     image_templates:
-      - "ghcr.io/matzegebbe/web-jwks-validator:v{{ .Version }}"
\ No newline at end of file
+      - "ghcr.io/matzegebbe/web-jwks-validator:v{{ .Version }}"
+