diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index d5e2bd4..cb5a3b6 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -65,7 +65,6 @@ changelog:
 dockers:
   - image_templates:
       - "anchore/ecs-inventory:latest"
-      - "anchore/ecs-inventory:{{ .Tag }}-amd64"
       - "anchore/ecs-inventory:v{{ .Major }}-amd64"
       - "anchore/ecs-inventory:v{{ .Major }}.{{ .Minor }}-amd64"
     dockerfile: Dockerfile
@@ -78,9 +77,22 @@ dockers:
       - "--build-arg=BUILD_VERSION={{.Version}}"
       - "--build-arg=VCS_REF={{.FullCommit}}"
       - "--build-arg=VCS_URL={{.GitURL}}"
+    skip_push: auto
+
+  - image_templates:
+      - "anchore/ecs-inventory:{{ .Tag }}-amd64"
+    dockerfile: Dockerfile
+    use: buildx
+    ids:
+      - generic
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--build-arg=BUILD_DATE={{.Date}}"
+      - "--build-arg=BUILD_VERSION={{.Version}}"
+      - "--build-arg=VCS_REF={{.FullCommit}}"
+      - "--build-arg=VCS_URL={{.GitURL}}"
 
   - image_templates:
-      - "anchore/ecs-inventory:{{ .Tag }}-arm64v8"
       - "anchore/ecs-inventory:v{{ .Major }}-arm64v8"
       - "anchore/ecs-inventory:v{{ .Major }}.{{ .Minor }}-arm64v8"
     goarch: arm64
@@ -94,6 +106,21 @@ dockers:
       - "--build-arg=BUILD_VERSION={{.Version}}"
       - "--build-arg=VCS_REF={{.FullCommit}}"
       - "--build-arg=VCS_URL={{.GitURL}}"
+    skip_push: auto
+
+  - image_templates:
+      - "anchore/ecs-inventory:{{ .Tag }}-arm64v8"
+    goarch: arm64
+    dockerfile: Dockerfile
+    use: buildx
+    ids:
+      - generic
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+      - "--build-arg=BUILD_DATE={{.Date}}"
+      - "--build-arg=BUILD_VERSION={{.Version}}"
+      - "--build-arg=VCS_REF={{.FullCommit}}"
+      - "--build-arg=VCS_URL={{.GitURL}}"
 
   - image_templates:
       - "anchore/ecs-inventory:{{ .Tag }}-fips-amd64"
@@ -118,6 +145,7 @@ docker_manifests:
       - anchore/ecs-inventory:{{ .Tag }}-arm64v8
       - anchore/ecs-inventory:v{{ .Major }}-arm64v8
       - anchore/ecs-inventory:v{{ .Major }}.{{ .Minor }}-arm64v8
+    skip_push: auto
   - name_template: anchore/ecs-inventory:latest
     image_templates:
       - anchore/ecs-inventory:{{ .Tag }}-amd64
@@ -127,4 +155,5 @@ docker_manifests:
       - anchore/ecs-inventory:{{ .Tag }}-arm64v8
       - anchore/ecs-inventory:v{{ .Major }}-arm64v8
       - anchore/ecs-inventory:v{{ .Major }}.{{ .Minor }}-arm64v8
+    skip_push: auto