diff --git a/.buildkite/scripts/package.sh b/.buildkite/scripts/package.sh
index d03b1d078..f053561a6 100755
--- a/.buildkite/scripts/package.sh
+++ b/.buildkite/scripts/package.sh
@@ -6,10 +6,10 @@ source .buildkite/scripts/common.sh
 
 VERSION=$(awk '/const DefaultVersion/{print $NF}' version/version.go | tr -d '"')
 PLATFORM_TYPE=$(uname -m)
-MATRIX_TYPE="$1"
+TYPE="$1"
 INFRA_REPO="https://github.com/repos/elastic/infra/contents"
 
-if [[ ${BUILDKITE_BRANCH} == "main" && ${MATRIX_TYPE} == "staging" ]]; then
+if [[ ${BUILDKITE_BRANCH} == "main" && ${TYPE} == "staging" ]]; then
     echo "INFO: staging artifacts for the main branch are not required."
     exit 0
 fi
@@ -27,10 +27,11 @@ with_mage
 
 case "${TYPE}" in
     "snapshot")
-        make release-manager-snapshot
+        export SNAPSHOT=true
+        make release
         ;;
     "staging")
-        make release-manager-release
+        make release
         ;;
     *)
     echo "The option is unsupported yet"
@@ -38,4 +39,4 @@ case "${TYPE}" in
 esac
 
 google_cloud_auth
-upload_mbp_packages_to_gcp_bucket "build/distributions/" "${MATRIX_TYPE}"
+upload_mbp_packages_to_gcp_bucket "build/distributions/" "${TYPE}"