diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake
index 7b3e98c76cd218..bdf8c223bf9a2d 100644
--- a/scripts/test_ports/cmake/portfile.cmake
+++ b/scripts/test_ports/cmake/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_gitlab(
     HEAD_REF master
     PATCHES
         curl.diff
+        rhash.diff
         fix-dependency-libuv.patch
 )
 set(OPTIONS)
@@ -38,22 +39,14 @@ vcpkg_cmake_configure(
     OPTIONS
         ${OPTIONS}
         -DBUILD_TESTING=OFF
-        #-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-        -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
-        -DCMAKE_USE_SYSTEM_CURL=ON
-        -DCMAKE_USE_SYSTEM_EXPAT=ON
-        -DCMAKE_USE_SYSTEM_ZLIB=ON
-        -DCMAKE_USE_SYSTEM_BZIP2=ON
-        -DCMAKE_USE_SYSTEM_ZSTD=ON
-        -DCMAKE_USE_SYSTEM_FORM=ON
-        -DCMAKE_USE_SYSTEM_JSONCPP=ON
-        -DCMAKE_USE_SYSTEM_LIBRHASH=OFF # not yet in VCPKG
-        -DCMAKE_USE_SYSTEM_LIBUV=ON
+        -DCMAKE_USE_SYSTEM_LIBRARIES=ON
         -DBUILD_QtDialog=ON # Just to test Qt with CMake
         -DCMake_QT_MAJOR_VERSION:STRING=6
+        --trace-expand
 )
+file(COPY_FILE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/cmake_install.cmake" "${CURRENT_BUILDTREES_DIR}/cmake_install.cmake-${TARGET_TRIPLET}-dbg.log")
 
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 if(NOT VCPKG_TARGET_IS_OSX)
diff --git a/scripts/test_ports/cmake/rhash.diff b/scripts/test_ports/cmake/rhash.diff
new file mode 100644
index 00000000000000..4a686e6742f433
--- /dev/null
+++ b/scripts/test_ports/cmake/rhash.diff
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a5d69b41..9789ffb6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -435,7 +435,8 @@ macro (CMAKE_BUILD_UTILITIES)
+   endif()
+ 
+   if(CMAKE_USE_SYSTEM_LIBRHASH)
+-    find_package(LibRHash)
++    find_package(LibRHash NAMES unofficial-rhash REQUIRED)
++    add_library(LibRHash::LibRHash ALIAS unofficial::rhash::rhash)
+     if(NOT LibRHash_FOUND)
+       message(FATAL_ERROR
+         "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json
index 35bb3d346a7cfa..6fae7f98c28a72 100644
--- a/scripts/test_ports/cmake/vcpkg.json
+++ b/scripts/test_ports/cmake/vcpkg.json
@@ -6,24 +6,29 @@
   "homepage": "https://cmake.org/",
   "license": "BSD-3-Clause",
   "dependencies": [
-    "bzip2",
-    "curl",
+    {
+      "name": "curl",
+      "default-features": false
+    },
     "expat",
     "jsoncpp",
-    "libarchive",
-    "liblzma",
+    {
+      "name": "libarchive",
+      "default-features": false
+    },
     "libuv",
     {
       "name": "ncurses",
       "platform": "!(windows | uwp)"
     },
-    "nghttp2",
-    "qtbase",
+    "rhash",
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    "zlib",
-    "zstd"
+    }
   ]
 }
diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
index bae9251c39f242..53ec77ec42947a 100644
--- a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
@@ -14,7 +14,6 @@
     {
       "name": "curl",
       "features": [
-        "c-ares",
         "http2",
         "zstd"
       ]
@@ -30,7 +29,6 @@
     {
       "name": "curl",
       "features": [
-        "gsasl",
         "psl"
       ],
       "platform": "!uwp"
@@ -49,13 +47,6 @@
         "tool"
       ],
       "platform": "!android & !uwp"
-    },
-    {
-      "name": "curl",
-      "features": [
-        "gnutls"
-      ],
-      "platform": "!arm & !xbox"
     }
   ]
 }