diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index e96675f..4779ce7 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -23,13 +23,7 @@ builds:
 archives:
   - format: tar.gz
     # this name template makes the OS and Arch compatible with the results of `uname`.
-    name_template: >-
-      {{ .ProjectName }}_
-      {{- .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    name_template: "{{ .ProjectName }}_{{ .Tag }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     # use zip for windows archives
     format_overrides:
       - goos: windows
diff --git a/.krew.yaml b/.krew.yaml
index 41db9c3..5e33414 100644
--- a/.krew.yaml
+++ b/.krew.yaml
@@ -10,7 +10,7 @@ spec:
         matchLabels:
           os: darwin
           arch: amd64
-      {{addURIAndSha "https://github.com/piraeusdatastore/kubectl-linstor/releases/download/{{ .TagName }}/kubectl-linstor_{{ .TagName }}_darwin_x86_64.tar.gz" .TagName }}
+      {{addURIAndSha "https://github.com/piraeusdatastore/kubectl-linstor/releases/download/{{ .TagName }}/kubectl-linstor_{{ .TagName }}_darwin_amd64.tar.gz" .TagName }}
       files:
         - from: ./kubectl-linstor
           to: .
@@ -32,7 +32,7 @@ spec:
           matchLabels:
             os: linux
             arch: amd64
-        {{addURIAndSha "https://github.com/piraeusdatastore/kubectl-linstor/releases/download/{{ .TagName }}/kubectl-linstor_{{ .TagName }}_linux_x86_64.tar.gz" .TagName }}
+        {{addURIAndSha "https://github.com/piraeusdatastore/kubectl-linstor/releases/download/{{ .TagName }}/kubectl-linstor_{{ .TagName }}_linux_amd64.tar.gz" .TagName }}
         files:
           - from: ./kubectl-linstor
             to: .
@@ -65,7 +65,7 @@ spec:
       matchLabels:
         os: windows
         arch: amd64
-      {{addURIAndSha "https://github.com/piraeusdatastore/kubectl-linstor/releases/download/{{ .TagName }}/kubectl-linstor_{{ .TagName }}_windows_x86_64.tar.gz" .TagName }}
+      {{addURIAndSha "https://github.com/piraeusdatastore/kubectl-linstor/releases/download/{{ .TagName }}/kubectl-linstor_{{ .TagName }}_windows_amd64.zip" .TagName }}
       files:
         - from: ./kubectl-linstor
           to: .