diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh
index 53dbed76d04d58fb4e001e73ebc641e043e702e5..4a21104e28980eb2e9ff36d7b0eb99fa9df15c60 100755
--- a/tools/run_tests/build_package_node.sh
+++ b/tools/run_tests/build_package_node.sh
@@ -35,7 +35,9 @@ set -ex
 
 cd $(dirname $0)/../..
 
-artifacts=$(pwd)/artifacts
+base=$(pwd)
+
+artifacts=$base/artifacts
 
 mkdir -p $artifacts
 cp -r $EXTERNAL_GIT_ROOT/architecture={x86,x64},language=node,platform={windows,linux,macos}/artifacts/* $artifacts/ || true
@@ -47,6 +49,15 @@ cp grpc-*.tgz $artifacts/grpc.tgz
 
 mkdir -p bin
 
+cd src/node/tools
+npm update
+npm pack
+cp grpc-tools-*.tgz $artifacts/
+tools_version=$(npm list | grep -oP '(?<=grpc-tools@)\\S+')
+
+output_dir=$artifacts/grpc-precompiled-binaries/node/grpc-tools/$tools_version
+mkdir -p $output_dir
+
 for arch in {x86,x64}; do
   case arch in
     x86)
@@ -70,15 +81,6 @@ for arch in {x86,x64}; do
     input_dir="$EXTERNAL_GIT_ROOT/architecture=$arch,language=protoc,platform=$plat/artifacts"
     cp $input_dir/protoc* bin/
     cp $input_dir/grpc_node_plugin* bin/
-    # For now, this will have to be manually uploaded to a folder with the
-    # correct package version
-    output_dir=$artifacts/grpc-precompiled-binaries/node/grpc-tools
-    mkdir -p $output_dir
     tar -czf $output_dir/$node_plat-$node_arch.tar.gz bin/
   done
 done
-
-cd src/node/tools
-npm update
-npm pack
-cp grpc-tools-*.tgz $artifacts/