diff --git a/scripts/env.sh b/scripts/env.sh
index 29b6550e..1e52bb3d 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -230,6 +230,12 @@ fi
 
 PATH="${PROJECT_EXTERNAL_BUILD_ROOT}/bin:${PATH}"
 
+if [ "${PROJECT_IS_MINGW}" == "1" ]; then
+  PROJECT_OS=win32
+else
+  PROJECT_OS=linux
+fi
+
 export MSYS
 export NUM_JOBS
 export OPENSSL_ROOT_DIR
@@ -254,6 +260,7 @@ export PROJECT_LINK_TYPE
 export PROJECT_MINGW64_COPY_DEPENDENCIES
 export PROJECT_MINGW64_DOCKER_BUILD_ARGS
 export PROJECT_MSYS2_PACKAGE_LIST
+export PROJECT_OS
 export PROJECT_PRIVATE_KEY
 export PROJECT_PUBLIC_KEY
 export PROJECT_REQUIRE_ALPINE
diff --git a/scripts/make_package.cmd b/scripts/make_package.cmd
index 32478fb7..a6955ea9 100644
--- a/scripts/make_package.cmd
+++ b/scripts/make_package.cmd
@@ -2,11 +2,12 @@
 
 setlocal
 
-set DEST=%~1
-set ARG1=%~2
-set ARG2=%~3
-set ARG3=%~4
+set VERSION=%~1
+set DEST=%~2
+set ARG1=%~3
+set ARG2=%~4
+set ARG3=%~5
 
 pushd "%~dp0%"
-  call mingw64 -no-start ./make_package.sh "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
+  call mingw64 -no-start ./make_package.sh "%VERSION%" "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
diff --git a/scripts/make_package.sh b/scripts/make_package.sh
index b98c473e..0c66fa0f 100644
--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-DEST_DIR=$(realpath $1)
+PROJECT_VERSION=$1
+DEST_DIR=$(realpath $2)
 
 CURRENT_DIR=$(dirname "$0")
 CURRENT_DIR=$(realpath ${CURRENT_DIR})
 
-. "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6"
+. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
 
 TEMP_DIR=$(mktemp -d)
 
@@ -15,6 +16,11 @@ function exit_and_clean() {
   exit $2
 }
 
+if [ "${PROJECT_VERSION}" == "" ]; then
+  echo "Project version not set"
+  exit 1
+fi
+
 if [ ! -d "${PROJECT_DIST_DIR}" ]; then
   echo "Dist directory not found: ${PROJECT_DIST_DIR}"
   exit 1
@@ -31,7 +37,7 @@ PACKAGE_ROOT=$(realpath ${PACKAGE_ROOT})
 rsync -av --progress ${PACKAGE_ROOT}/ ${TEMP_DIR}/ || exit_and_clean "Failed to rsync" 1
 
 pushd "${DEST_DIR}"
-tar cvzf ${PROJECT_APP_NAME}.tar.gz -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1
+tar cvzf ${PROJECT_APP_NAME}_${PROJECT_VERSION}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}.tar.gz -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1
 popd
 
 exit_and_clean "Created package successfully" 0