diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c379827c3..6e16454796 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -690,7 +690,10 @@ if (ENABLE_SDL2)
     elseif (YUZU_USE_EXTERNAL_SDL2)
         message(STATUS "Using SDL2 from externals.")
     endif()
-    find_package(SDL2 2.26.4 REQUIRED)
+
+    if (NOT YUZU_USE_EXTERNAL_SDL2)
+        find_package(SDL2 2.26.4 REQUIRED)
+    endif()
 endif()
 
 # List of all FFmpeg components required
diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake
index 8122d59b92..764917e00b 100644
--- a/CMakeModules/CPMUtil.cmake
+++ b/CMakeModules/CPMUtil.cmake
@@ -360,7 +360,7 @@ function(AddCIPackage)
     endif()
 
     if (DEFINED ARTIFACT_DIR)
-        include(${ARTIFACT_DIR}/${ARTIFACT_NAME}.cmake)
+        include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake)
 
         # Overrides find package
         CPMAddPackage(
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 71dd2962e7..2269989822 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -95,7 +95,7 @@ if (ENABLE_LIBUSB AND NOT TARGET libusb::usb)
 endif()
 
 # SDL2
-if (NOT YUZU_USE_BUNDLED_SDL2)
+if (YUZU_USE_EXTERNAL_SDL2)
     if (NOT WIN32)
         # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
         # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5f9bfa2214..eab506f194 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1251,11 +1251,7 @@ if(ENABLE_OPENSSL)
 
     find_package(OpenSSL REQUIRED)
 
-    if (OpenSSL_ADDED)
-        link_openssl(core)
-    else()
-        target_link_libraries(core PRIVATE OpenSSL::SSL)
-    endif()
+    target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 elseif (APPLE)
     target_sources(core PRIVATE
         hle/service/ssl/ssl_backend_securetransport.cpp)
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index c1d5a84225..c1aaac9881 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -18,12 +18,8 @@ create_target_directory_groups(web_service)
 target_include_directories(web_service PUBLIC ${cpp-jwt_SOURCE_DIR}/include)
 target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt::cpp-jwt)
 
-if (OpenSSL_ADDED)
-    link_openssl(web_service)
-else()
-    find_package(OpenSSL REQUIRED)
-    target_link_libraries(web_service PRIVATE OpenSSL::SSL)
-endif()
+find_package(OpenSSL REQUIRED)
+target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 
 if (YUZU_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(web_service PRIVATE precompiled_headers.h)