diff --git a/.goreleaser.yml b/.goreleaser.yml
index 5df898e8..e788f97e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -22,22 +22,23 @@ builds:
       - -s
       - -w
       - -X "github.com/gptscript-ai/gptscript/pkg/version.Tag=v{{ .Version }}"
-    hooks:
-      post: ./scripts/copy-cred-helper.sh {{ .Os }} {{ .Arch }}
 
 universal_binaries:
   - id: mac
     ids:
       - default
     replace: true
-    hooks:
-      post: cp binaries/gptscript-credential-osxkeychain releases/mac_darwin_all
 
 archives:
   - id: default
     builds:
       - default
       - mac
+    files:
+      - LICENSE*
+      - README*
+      - src: '{{ if eq .Os "darwin" }}binaries/darwin/*{{ else }}binaries/{{ .Os }}/{{ .Arch }}/*{{ end }}'
+        strip_parent: true
     name_template: 'gptscript-v{{ .Version }}-{{ if eq .Os "darwin" }}macOS-universal{{ else }}{{ .Os }}-{{ .Arch }}{{ .Arm }}{{ end }}'
     format_overrides:
       - goos: windows
diff --git a/scripts/copy-cred-helper.sh b/scripts/copy-cred-helper.sh
deleted file mode 100755
index afe5a74c..00000000
--- a/scripts/copy-cred-helper.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-OS="$1"
-ARCH="$2"
-
-case "$OS" in
-	"darwin")
-		case "$ARCH" in
-			"amd64")
-				cp binaries/gptscript-credential-osxkeychain releases/default_darwin_amd64_v1
-				;;
-			"arm64")
-				cp binaries/gptscript-credential-osxkeychain releases/default_darwin_arm64
-				;;
-		esac
-		;;
-	"windows")
-		case "$ARCH" in
-			"amd64")
-				cp binaries/gptscript-credential-wincred-amd64.exe releases/default_windows_amd64_v1/gptscript-credential-wincred.exe
-				;;
-			"arm64")
-				cp binaries/gptscript-credential-wincred-arm64.exe releases/default_windows_arm64/gptscript-credential-wincred.exe
-				;;
-		esac
-		;;
-esac
diff --git a/scripts/download-cred-helpers.sh b/scripts/download-cred-helpers.sh
index ae940466..f22a8a35 100755
--- a/scripts/download-cred-helpers.sh
+++ b/scripts/download-cred-helpers.sh
@@ -7,14 +7,18 @@ set -euo pipefail
 GPTSCRIPT_CRED_HELPERS_VERSION="v0.1.0"
 BINARY_DIR="binaries"
 
-mkdir -p "$BINARY_DIR"
+mkdir -p $BINARY_DIR/darwin
+mkdir -p $BINARY_DIR/windows/{amd64,arm64}
 cd "$BINARY_DIR"
 
 wget -O gptscript-credential-osxkeychain "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-osxkeychain"
 chmod +x gptscript-credential-osxkeychain
+mv gptscript-credential-osxkeychain darwin/gptscript-credential-osxkeychain
 
 wget -O gptscript-credential-wincred-amd64.exe "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-wincred-${GPTSCRIPT_CRED_HELPERS_VERSION}.windows-amd64.exe"
 chmod +x gptscript-credential-wincred-amd64.exe
+mv gptscript-credential-wincred-amd64.exe windows/amd64/gptscript-credential-wincred.exe
 
 wget -O gptscript-credential-wincred-arm64.exe "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-wincred-${GPTSCRIPT_CRED_HELPERS_VERSION}.windows-arm64.exe"
 chmod +x gptscript-credential-wincred-arm64.exe
+mv gptscript-credential-wincred-arm64.exe windows/arm64/gptscript-credential-wincred.exe