diff --git a/.goreleaser.yml b/.goreleaser.yml
index c7b37cb..241c3d1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -40,10 +40,28 @@ builds:
       - amd64
 
 archives:
-  - formats: ['tar.gz']
+  - id: 'x32-cli-archive'
+    builds: ['x32-cli']
+    formats: ['tar.gz']
     # this name template makes the OS and Arch compatible with the results of `uname`.
     name_template: >-
-      {{ .ProjectName }}_
+      x32-cli_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+      - goos: windows
+        formats: ['zip']
+
+  - id: 'xair-cli-archive'
+    builds: ['xair-cli']
+    formats: ['tar.gz']
+    # this name template makes the OS and Arch compatible with the results of `uname`.
+    name_template: >-
+      xair-cli_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386