diff --git a/ports/vcpkg-tool-nodejs/portfile.cmake b/ports/vcpkg-tool-nodejs/portfile.cmake
index 171693976f3d1c..bd9b496810d8ed 100644
--- a/ports/vcpkg-tool-nodejs/portfile.cmake
+++ b/ports/vcpkg-tool-nodejs/portfile.cmake
@@ -61,3 +61,8 @@ vcpkg_execute_in_download_mode(
 )
 
 file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/node")
+
+# Do not break code signatures
+if(VCPKG_TARGET_IS_OSX)
+    set(VCPKG_FIXUP_MACHO_RPATH OFF)
+endif()
diff --git a/ports/vcpkg-tool-nodejs/vcpkg.json b/ports/vcpkg-tool-nodejs/vcpkg.json
index 9a45f82482cf4f..f8a3bc02f84eec 100644
--- a/ports/vcpkg-tool-nodejs/vcpkg.json
+++ b/ports/vcpkg-tool-nodejs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-tool-nodejs",
   "version-semver": "16.18.0",
-  "port-version": 1,
+  "port-version": 2,
   "supports": "native"
 }
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/portfile.cmake b/scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/portfile.cmake
new file mode 100644
index 00000000000000..6cf461637611b6
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/portfile.cmake
@@ -0,0 +1,20 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+find_program(NODEJS
+    NAMES node
+    PATHS
+        "${CURRENT_INSTALLED_DIR}/tools/node"
+        "${CURRENT_INSTALLED_DIR}/tools/node/bin"
+    NO_DEFAULT_PATH
+    REQUIRED
+)
+execute_process(
+    COMMAND "${NODEJS}" --version
+    COMMAND_ECHO STDOUT
+    COMMAND_ERROR_IS_FATAL ANY
+)
+execute_process(
+    COMMAND "${NODEJS}" -p "process.arch"
+    COMMAND_ECHO STDOUT
+    COMMAND_ERROR_IS_FATAL ANY
+)
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/vcpkg.json b/scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/vcpkg.json
new file mode 100644
index 00000000000000..20f8b6dfa38765
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "vcpkg-ci-vcpkg-tool-nodejs",
+  "version-string": "ci",
+  "description": "Test port to validate vcpkg-tool-nodejs",
+  "supports": "native",
+  "dependencies": [
+    "vcpkg-tool-nodejs"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 940cfe688fb65f..e2e1e027e85d97 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9950,7 +9950,7 @@
     },
     "vcpkg-tool-nodejs": {
       "baseline": "16.18.0",
-      "port-version": 1
+      "port-version": 2
     },
     "vcpkg-tool-python2": {
       "baseline": "2.7.18",
diff --git a/versions/v-/vcpkg-tool-nodejs.json b/versions/v-/vcpkg-tool-nodejs.json
index 06f393ea2529ce..657fd60167fd70 100644
--- a/versions/v-/vcpkg-tool-nodejs.json
+++ b/versions/v-/vcpkg-tool-nodejs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6d004b33aa9e92c31d1238728de1546712af44d0",
+      "version-semver": "16.18.0",
+      "port-version": 2
+    },
     {
       "git-tree": "2738f551c277a4ac6650e7d140fc36aa26210a63",
       "version-semver": "16.18.0",