diff --git a/.goreleaser.yml b/.goreleaser.yml
index 9078fcc1e2..d3d38db067 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -14,15 +14,15 @@ builds:
     env:
       - CGO_ENABLED=0
     targets:
-      # - darwin_amd64
-      # - darwin_arm64
-      # - freebsd_amd64
-      # - linux_386
+      - darwin_amd64
+      - darwin_arm64
+      - freebsd_amd64
+      - linux_386
       - linux_amd64
-      # - linux_arm64
-      # - linux_arm_5
-      # - linux_arm_6
-      # - linux_arm_7
+      - linux_arm64
+      - linux_arm_5
+      - linux_arm_6
+      - linux_arm_7
     flags:
       - -mod=readonly
     ldflags:
@@ -81,22 +81,23 @@ nfpms:
 
 kos:
   - id: ghcr
+    repository: ghcr.io/kradalby/headscale
+    base_image: gcr.io/distroless/base-debian11
     build: headscale
     main: ./cmd/headscale
-    base_image: gcr.io/distroless/base-debian11
-    repository: ghcr.io/juanfont/headscale
     env:
       - CGO_ENABLED=0
     platforms:
       - linux/amd64
-      # - linux/386
-      # - linux/arm64
-      # - linux/arm/v7
-      # - linux/arm/v6
-      # - linux/arm/v5
+      - linux/386
+      - linux/arm64
+      - linux/arm/v7
+      - linux/arm/v6
+      - linux/arm/v5
     tags:
       - latest
-      - '{{.Tag}}'
+      - '{{ .Tag }}'
+      - '{{ .Major }}.{{ .Minor }}.{{ .Patch }}'
       - '{{ .Major }}.{{ .Minor }}'
       - '{{ .Major }}'
       - '{{ if not .Prerelease }}stable{{ end }}'