diff --git a/.goreleaser.yml b/.goreleaser.yml
index 60eff7e7..207c75bd 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -32,25 +32,16 @@ builds:
     id: step-cloudkms-init
     env:
       - CGO_ENABLED=0
-    goos:
-      - linux
-      - darwin
-      - windows
-    goarch:
-      - amd64
-      - arm
-      - arm64
-      - 386
-    goarm:
-      - 6
-      - 7
-    ignore:
-     - goos: windows
-       goarch: 386
-     - goos: windows
-       goarm: 6
-     - goos: windows
-       goarm: 7
+    targets:
+      - darwin_amd64
+      - darwin_arm64
+      - freebsd_amd64
+      - linux_386
+      - linux_amd64
+      - linux_arm64
+      - linux_arm_6
+      - linux_arm_7
+      - windows_amd64
     flags:
       - -trimpath
     main: ./cmd/step-cloudkms-init/main.go
@@ -61,25 +52,16 @@ builds:
     id: step-awskms-init
     env:
       - CGO_ENABLED=0
-    goos:
-      - linux
-      - darwin
-      - windows
-    goarch:
-      - amd64
-      - arm
-      - arm64
-      - 386
-    goarm:
-      - 6
-      - 7
-    ignore:
-     - goos: windows
-       goarch: 386
-     - goos: windows
-       goarm: 6
-     - goos: windows
-       goarm: 7
+    targets:
+      - darwin_amd64
+      - darwin_arm64
+      - freebsd_amd64
+      - linux_386
+      - linux_amd64
+      - linux_arm64
+      - linux_arm_6
+      - linux_arm_7
+      - windows_amd64
     flags:
       - -trimpath
     main: ./cmd/step-awskms-init/main.go