diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d16d6c6..020d3f7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -14,6 +14,9 @@ jobs:
       - name: Unshallow
         run: git fetch --prune --unshallow
 
+      - name: Set up Qemu
+        uses: docker/setup-qemu-action@v1
+
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
diff --git a/.github/workflows/test-and-snapshot.yaml b/.github/workflows/test-and-snapshot.yaml
index ea4eed3..930b15d 100644
--- a/.github/workflows/test-and-snapshot.yaml
+++ b/.github/workflows/test-and-snapshot.yaml
@@ -21,6 +21,9 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
+      - name: Set up Qemu
+        uses: docker/setup-qemu-action@v1
+
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 2369fc0..b03b2af 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -8,8 +8,8 @@ builds:
       - darwin
       - windows
     goarch:
+      - "386"
       - amd64
-      - '386'
       - arm
       - arm64
       - mips64le
@@ -26,14 +26,37 @@ release:
     owner: ribbybibby
     name: ssl_exporter
 dockers:
-- image_templates:
-  - '{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}'
-  - '{{.Env.APP_DOCKER_IMAGE_NAME}}:latest'
-  dockerfile: Dockerfile
-  build_flag_templates:
-  - "--pull"
-  - "--label=org.opencontainers.image.created={{.Date}}"
-  - "--label=org.opencontainers.image.name={{.ProjectName}}"
-  - "--label=org.opencontainers.image.revision={{.Commit}}"
-  - "--label=org.opencontainers.image.version={{.Version}}"
-  - "--label=org.opencontainers.image.source={{.GitURL}}"
+  - image_templates:
+      - "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}-amd64"
+    dockerfile: Dockerfile
+    use: buildx
+    build_flag_templates:
+      - "--pull"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--platform=linux/amd64"
+  - image_templates:
+      - "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}-arm64"
+    dockerfile: Dockerfile
+    use: buildx
+    build_flag_templates:
+      - "--pull"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--platform=linux/arm64"
+    goarch: arm64
+docker_manifests:
+  - name_template: "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}"
+    image_templates:
+      - "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}-amd64"
+      - "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}-arm64"
+  - name_template: "{{.Env.APP_DOCKER_IMAGE_NAME}}:latest"
+    image_templates:
+      - "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}-amd64"
+      - "{{.Env.APP_DOCKER_IMAGE_NAME}}:{{.Version}}-arm64"