diff --git a/scripts/cli_artifacts.sh b/scripts/cli_artifacts.sh
index e20c1dea02c4..96ec5f286e3a 100755
--- a/scripts/cli_artifacts.sh
+++ b/scripts/cli_artifacts.sh
@@ -8,12 +8,17 @@ do
   BINDING_ABI=${BINDING_NAME%%.*}
   CLI_BINARY_PATH=${filename%%.*}
 
+  echo "Preparing build artifacts:"
+  echo "Binding name $BINDING_NAME"
+  echo "Filename $filename"
+  echo "Cli binary path $CLI_BINARY_PATH"
+
   if [ -f "$CLI_BINARY_PATH" ]; then
       chmod +x $CLI_BINARY_PATH
-      cp -v $CLI_BINARY_PATH ./artifacts_cli/$BINDING_ABI
+      cp -v $CLI_BINARY_PATH ./artifacts_cli/swc-$BINDING_ABI
       mv $CLI_BINARY_PATH ./scripts/npm/$BINDING_ABI
   elif [ -f "$CLI_BINARY_PATH.exe" ]; then
-      cp -v $CLI_BINARY_PATH.exe ./artifacts_cli/$BINDING_ABI
+      cp -v $CLI_BINARY_PATH.exe ./artifacts_cli/swc-$BINDING_ABI
       mv $CLI_BINARY_PATH.exe ./scripts/npm/$BINDING_ABI
   fi
 done
\ No newline at end of file
diff --git a/scripts/cli_upload_gh_release.sh b/scripts/cli_upload_gh_release.sh
index 3dc3b3e78664..dedc0db67524 100755
--- a/scripts/cli_upload_gh_release.sh
+++ b/scripts/cli_upload_gh_release.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Naive substitution to napi artifacts for the cli binary.
-for filename in artifacts_cli/*/*
+for filename in artifacts_cli/*
 do
   echo "Trying to upload $filename"