diff --git a/.goreleaser.yml b/.goreleaser.yml
index 411155c0..c6c83ff4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -44,12 +44,9 @@ dockers:
   - goos: linux
     goarch: amd64
     dockerfile: goreleaser.dockerfile
+    use: buildx
     image_templates:
-      - "admiralpiett/goaws"
-      - "admiralpiett/goaws:{{ .Tag }}"
       - "admiralpiett/goaws:{{ .Tag }}-amd64"
-      - "admiralpiett/goaws:latest-amd64"
-      - "admiralpiett/goaws:latest"
     extra_files:
       - app/conf/goaws.yaml
     build_flag_templates:
@@ -57,14 +54,24 @@ dockers:
   - goos: linux
     goarch: arm64
     dockerfile: goreleaser.dockerfile
+    use: buildx
     image_templates:
       - "admiralpiett/goaws:{{ .Tag }}-arm64"
-      - "admiralpiett/goaws:latest-arm64"
     extra_files:
       - app/conf/goaws.yaml
     build_flag_templates:
       - "--platform=linux/arm64"
 
+docker_manifests:
+- name_template: admiralpiett/goaws:{{ .Tag }}
+  image_templates:
+  - admiralpiett/goaws:{{ .Tag }}-amd64
+  - admiralpiett/goaws:{{ .Tag }}-arm64
+- name_template: admiralpiett/goaws:latest
+  image_templates:
+  - admiralpiett/goaws:{{ .Tag }}-amd64
+  - admiralpiett/goaws:{{ .Tag }}-arm64
+
 archives:
   - id: archive_names
     name_template: >-