diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index e828505e..91f3de37 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13
+          go-version: 1.17
         id: go
 
       - name: Checkout
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 6e726fd7..839ffa43 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -8,10 +8,10 @@ builds:
     goarch:
       - amd64
       - arm64
-
-# Build one binary for Mac OS (arm64 and amd64)
-universal_binaries:
-  - replace: true
+    ignore:
+      # Windows arm64 is not used and does not compile well as of writing
+      - goos: windows
+        goarch: arm64
 
 # Archive customization
 archives: