diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e16454796..593b80c107 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,6 +412,7 @@ if (YUZU_USE_CPM)
                 REPO crueter-ci/OpenSSL
                 VERSION 3.5.2
                 MIN_VERSION 1.1.1
+                FORCE_DOWNLOAD ${FORCE_DOWNLOAD_OPENSSL}
             )
         endif()
 
@@ -684,8 +685,8 @@ if (ENABLE_SDL2)
             REPO crueter-ci/SDL2
             VERSION 2.32.8
             MIN_VERSION 2.26.4
-            DISABLED_PLATFORMS "solaris"
             CMAKE_FILENAME sdl2
+            FORCE_DOWNLOAD ${FORCE_DOWNLOAD_SDL2}
         )
     elseif (YUZU_USE_EXTERNAL_SDL2)
         message(STATUS "Using SDL2 from externals.")
@@ -758,7 +759,7 @@ if (ENABLE_QT)
     endif()
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        find_package(Qt6 REQUIRED COMPONENTS DBus GuiPrivate)
+        find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
     elseif (UNIX AND NOT APPLE)
         find_package(Qt6 REQUIRED COMPONENTS DBus Gui)
     endif()
diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake
index 764917e00b..21e01ba8cf 100644
--- a/CMakeModules/CPMUtil.cmake
+++ b/CMakeModules/CPMUtil.cmake
@@ -355,10 +355,14 @@ function(AddCIPackage)
         add_ci_package(freebsd)
     endif()
 
-    if(PLATFORM_LINUX OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
+    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
         add_ci_package(linux)
     endif()
 
+    if((PLATFORM_LINUX AND ARCHITECTURE_arm64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux-aarch64)
+    endif()
+
     if (DEFINED ARTIFACT_DIR)
         include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake)
 
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index f7ec2985c7..f979a5c181 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -406,7 +406,11 @@ if (NOT WIN32)
     target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
 endif()
 if (UNIX AND NOT APPLE)
-    target_link_libraries(yuzu PRIVATE Qt6::DBus Qt6::GuiPrivate)
+    target_link_libraries(yuzu PRIVATE Qt6::DBus)
+
+    if (TARGET Qt6::GuiPrivate)
+        target_link_libraries(yuzu PRIVATE Qt6::GuiPrivate)
+    endif()
 endif()
 
 target_compile_definitions(yuzu PRIVATE