diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 524680f..6cbc5ac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,15 +13,16 @@ jobs:
       run: git fetch --prune --unshallow
     - uses: actions/setup-go@v2
       with:
-        go-version: '^1.14.0'
+        go-version: '^1.16.0'
     - name: Login to Docker Registry
       run: |
         docker login -u=princespaghetti -p="$DOCKER_PASSWORD"
       env:
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     - name: Release via goreleaser
-      uses: goreleaser/goreleaser-action@master
+      uses: goreleaser/goreleaser-action@v2
       with:
+        version: latest
         args: release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.goreleaser.yml b/.goreleaser.yml
index da3885e..f0ab63c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -24,15 +24,36 @@ archives:
     format: zip
 dockers:
   -
-    binaries:
-    - actionhero
     # GOOS of the built binary that should be used.
     goos: linux
     # GOARCH of the built binary that should be used.
     goarch: amd64
+    use: buildx
+    dockerfile: Dockerfile
+    build_flag_templates:
+      - "--platform=linux/amd64"
     image_templates:
-    - "docker.io/princespaghetti/actionhero:latest"
-    - "docker.io/princespaghetti/actionhero:{{ .Tag }}"
+    - "docker.io/princespaghetti/actionhero:{{ .Tag }}-amd64"
+  -
+    # GOOS of the built binary that should be used.
+    goos: linux
+    # GOARCH of the built binary that should be used.
+    goarch: arm64
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+    use: buildx
+    dockerfile: Dockerfile
+    image_templates:
+    - "docker.io/princespaghetti/actionhero:{{ .Tag }}-arm64v8"
+docker_manifests:
+  - name_template: docker.io/princespaghetti/actionhero:{{ .Tag }}
+    image_templates:
+      - docker.io/princespaghetti/actionhero:{{ .Tag }}-amd64
+      - docker.io/princespaghetti/actionhero:{{ .Tag }}-arm64v8
+  - name_template: docker.io/princespaghetti/actionhero:latest
+    image_templates:
+      - docker.io/princespaghetti/actionhero:{{ .Tag }}-amd64
+      - docker.io/princespaghetti/actionhero:{{ .Tag }}-arm64v8
 checksum:
   name_template: 'checksums.txt'
 snapshot: