diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f017b4280..9c84731c56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -398,9 +398,9 @@ find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
 
-if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    find_package(VulkanHeaders 1.3.274 REQUIRED)
-endif()
+# if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
+#     find_package(VulkanHeaders 1.3.274 REQUIRED)
+# endif()
 
 if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
     find_package(VulkanUtilityLibraries REQUIRED)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 516ef139e1..31fae30b12 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -162,14 +162,21 @@ if (YUZU_USE_BUNDLED_FFMPEG)
     set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
 endif()
 
-# TODO(crueter): I tried messing with these and it gave me 16,323 compilation errors
-# lol
-
 # Vulkan-Headers
 if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    add_subdirectory(Vulkan-Headers)
+    set(CPM_USE_LOCAL_PACKAGES OFF)
+else()
+    set(CPM_USE_LOCAL_PACKAGES ON)
 endif()
 
+CPMAddPackage(
+    NAME VulkanHeaders
+    VERSION 1.3.274
+    GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Headers.git"
+    GIT_TAG 89268a6d17
+    FIND_PACKAGE_ARGUMENTS "MODULE"
+)
+
 # Vulkan-Utility-Libraries
 if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
     add_subdirectory(Vulkan-Utility-Libraries)
diff --git a/src/yuzu/externals/CMakeLists.txt b/src/yuzu/externals/CMakeLists.txt
index d606e27108..23ddbfa6be 100644
--- a/src/yuzu/externals/CMakeLists.txt
+++ b/src/yuzu/externals/CMakeLists.txt
@@ -6,7 +6,6 @@ set(BUILD_SHARED_LIBS OFF)
 
 # QuaZip
 include(CPM)
-set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
 set(CPM_USE_LOCAL_PACKAGES ON)
 
 CPMAddPackage(