diff --git a/tools/pkg/build.sh b/tools/pkg/build.sh
index 04edb453e41..a9b53a9b645 100755
--- a/tools/pkg/build.sh
+++ b/tools/pkg/build.sh
@@ -72,9 +72,11 @@ for (( i = 0; i < $len - 1; i++ )); do
     i=$((i+1))
 done
 
-dockerfile_platform=${platform/_/:}
+builder_image="erlangsolutions/erlang:${platform}-${erlang_version}"
+target_image="${platform/-/:}"
 docker build -t mongooseim-${platform}:${version}-${revision} \
-    --build-arg dockerfile_platform=${dockerfile_platform} \
+    --build-arg builder_image=${builder_image} \
+    --build-arg target_image=${target_image} \
     --build-arg version=${version} \
     --build-arg revision=${revision} \
     --build-arg erlang_version=${erlang_version} \
diff --git a/tools/test.sh b/tools/test.sh
index 44eb405618e..77a378a237c 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -278,7 +278,7 @@ build_pkg () {
   cd tools/pkg
 
   local platform=$1
-  local esl_erlang_pkg_vsn=$2
+  local erlang_version=$2
   local project_root=$(git rev-parse --show-toplevel)
 
   if [[ $platform == rockylinux* ]] || [[ $platform == almalinux* ]]; then
@@ -302,7 +302,7 @@ build_pkg () {
     --platform $platform \
     --version $version \
     --revision $revision \
-    --erlang_version $esl_erlang_pkg_vsn \
+    --erlang_version $erlang_version \
     --dockerfile_path "$project_root/tools/pkg/$dockerfile_name" \
     --context_path $project_root \
     --built_packages_directory "$project_root/tools/pkg/packages"
@@ -331,7 +331,7 @@ elif [ "$PRESET" == "edoc_only" ]; then
   tools/print-dots.sh stop
   exit ${RESULT}
 elif [ "$PRESET" == "pkg" ]; then
-  build_pkg $pkg_PLATFORM $ESL_ERLANG_PKG_VER
+  build_pkg $pkg_PLATFORM $pkg_OTP_VERSION
 elif [ "$PRESET" == "small_tests" ]; then
   time maybe_run_small_tests
   SMALL_RESULT=$?