diff --git a/.ci/build-windows-clang-cl.ps1 b/.ci/build-windows-clang-cl.ps1
index 802a326c8e..ed98c58b22 100644
--- a/.ci/build-windows-clang-cl.ps1
+++ b/.ci/build-windows-clang-cl.ps1
@@ -57,6 +57,7 @@ $VcpkgTriplet=$env:VCPKG_TRIPLET
 $VcpkgInstall="$VcpkgRoot/installed/$VcpkgTriplet"
 $VcpkgInclude="$VcpkgInstall/include"
 $VcpkgLib="$VcpkgInstall/lib"
+$VcpkgWindeployqt="$VcpkgInstall/tools/qt6/bin/windeployqt6.exe"
 
 # Configure git safe directory
 Write-Host "Configuring git safe directory"
@@ -97,9 +98,9 @@ Write-Host "Running CMake configuration"
     -DCMAKE_TOOLCHAIN_FILE="$VcpkgRoot/scripts/buildsystems/vcpkg.cmake" `
     -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$clangBuiltinsDirShort /defaultlib:$clangBuiltinsLib" `
     -DCMAKE_MT="$mtExePath" `
+    -DWINDEPLOYQT_EXECUTABLE="$VcpkgWindeployqt" `
     -DUSE_NATIVE_INSTRUCTIONS=OFF `
     -DUSE_PRECOMPILED_HEADERS=OFF `
-    -DVCPKG_INSTALL_DIR="$VcpkgInstall" `
     -DVCPKG_TARGET_TRIPLET="$VcpkgTriplet" `
     -DFFMPEG_INCLUDE_DIR="$VcpkgInclude" `
     -DFFMPEG_LIBAVCODEC="$VcpkgLib/avcodec.lib" `
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index adfde89e45..2e98992303 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -413,7 +413,7 @@ jobs:
             arch: win64
     env:
       CCACHE_DIR: 'C:\ccache'
-      VCPKG_TRIPLET: x64-windows-release
+      VCPKG_TRIPLET: x64-windows
     steps:
       - name: Checkout repository
         uses: actions/checkout@main
@@ -434,7 +434,7 @@ jobs:
           path: |
             vcpkg/installed
             vcpkg/buildtrees
-          key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-16248552313
+          key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-test
           restore-keys: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-
 
       - name: Install dependencies with vcpkg
@@ -447,6 +447,7 @@ jobs:
             qtbase `
             qtsvg `
             qtmultimedia `
+            qttools `
             zlib `
             vulkan `
             libpng `
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 41d4bfd3c4..96e8504356 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -156,26 +156,11 @@ if (NOT ANDROID)
         add_custom_command(TARGET rpcs3 POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
             COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test)
-
-        if(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            message(STATUS "Using clang-cl: copying Qt DLLs from vcpkg manually")
-            set(QT_DLLS Qt6Core.dll Qt6Gui.dll Qt6Widgets.dll Qt6Concurrent.dll Qt6Multimedia.dll Qt6MultimediaWidgets.dll Qt6Svg.dll Qt6SvgWidgets.dll)
-
-            foreach(dll IN LISTS QT_DLLS)
-                add_custom_command(TARGET rpcs3 POST_BUILD
-                    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        "${VCPKG_INSTALL_DIR}/bin/${dll}"
-                        "$<TARGET_FILE_DIR:rpcs3>/${dll}")
-            endforeach()
-        else()
-            message(STATUS "Using windeployqt")
-            add_custom_command(TARGET rpcs3 POST_BUILD
-                COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
-                    --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import
-                    --plugindir "$<TARGET_FILE_DIR:rpcs3>/qt6/plugins"
-                    --verbose 0 "$<TARGET_FILE:rpcs3>")
-        endif()
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test
+            COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
+                --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import
+                --plugindir "$<TARGET_FILE_DIR:rpcs3>/qt6/plugins"
+                --verbose 0 "$<TARGET_FILE:rpcs3>")
     endif()
 
     # Unix installation