diff --git a/cicd/scripts/build-release-archive.sh b/cicd/scripts/build-release-archive.sh
index ee5c24563..9706355f2 100755
--- a/cicd/scripts/build-release-archive.sh
+++ b/cicd/scripts/build-release-archive.sh
@@ -1,14 +1,17 @@
 #!/usr/bin/env sh
 set -e
-ARCHIVE_NAME="$PROJECT_NAME-$RELEASE_TAG-$TARGET"
+
 case $TARGET in
     *windows*)
-        EXE_SUFFIX=.exe
+        BIN_NAME="${PROJECT_NAME}.exe"
     ;;
     *)
-        EXE_SUFFIX=
+        BIN_NAME="$PROJECT_NAME"
     ;;
 esac
+
+ARCHIVE_NAME="$PROJECT_NAME-$RELEASE_TAG-$TARGET"
+
 mkdir -p "$ARCHIVE_NAME"
 
 # Find where the build script put the generated completions files.
@@ -20,7 +23,7 @@ mv "$src_completions_dir" "$dst_completions_dir"
 
 cp README.md LICENSE "$ARCHIVE_NAME/"
 cp -a "$dst_completions_dir" "$ARCHIVE_NAME/"
-cp "target/$TARGET/release/${PROJECT_NAME}${EXE_SUFFIX}" "$ARCHIVE_NAME/"
+cp "target/$TARGET/release/$BIN_NAME" "$ARCHIVE_NAME/"
 
 case $TARGET in
     *windows*)