diff --git a/AppImageBuilder/assets/AppRun b/AppImageBuilder/assets/AppRun
new file mode 100755
index 000000000..5eb743556
--- /dev/null
+++ b/AppImageBuilder/assets/AppRun
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+cd "$APPDIR"
+
+if [ -d /usr/lib/$(uname -m)-linux-gnu/qt5 ] || [ -d /usr/lib/qt ]; then
+    # System-wide Qt5
+    exec ./yuzu.sh "$@"
+else
+    # Bundled Qt5
+    exec ./yuzu-bqt.sh "$@"
+fi
diff --git a/AppImageBuilder/assets/yuzu-bqt.sh b/AppImageBuilder/assets/yuzu-bqt.sh
new file mode 100755
index 000000000..22c7c71e1
--- /dev/null
+++ b/AppImageBuilder/assets/yuzu-bqt.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+LD_LIBRARY_PATH=./qt5:/usr/lib/$(uname -m)-linux-gnu:/usr/lib:. QT_PLUGIN_PATH=./qt5 exec ./yuzu "$@"
diff --git a/AppImageBuilder/assets/yuzu.sh b/AppImageBuilder/assets/yuzu.sh
new file mode 100755
index 000000000..7f25c932e
--- /dev/null
+++ b/AppImageBuilder/assets/yuzu.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+LD_LIBRARY_PATH=/usr/lib/$(uname -m)-linux-gnu:/usr/lib:. exec ./yuzu "$@"
diff --git a/AppImageBuilder/assets_aarch64/.gitkeep b/AppImageBuilder/assets_aarch64/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/AppImageBuilder/assets_aarch64/AppRun b/AppImageBuilder/assets_aarch64/AppRun
deleted file mode 100755
index 137ad6f0f..000000000
--- a/AppImageBuilder/assets_aarch64/AppRun
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/bash
-
-cd "$APPDIR"
-
-if [ -d /usr/lib/aarch64-linux-gnu/qt5 ]; then
-    exec ./yuzu-bwrap.sh "$@"
-else
-    if [ -d /usr/lib/aarch64-linux-gnu/qt6 ]; then
-        exec ./yuzu-bwrap.sh "$@"
-    else
-        exec ./yuzu.sh "$@"
-    fi
-fi
diff --git a/AppImageBuilder/assets_aarch64/yuzu-bwrap.sh b/AppImageBuilder/assets_aarch64/yuzu-bwrap.sh
deleted file mode 100755
index ea2f51eb7..000000000
--- a/AppImageBuilder/assets_aarch64/yuzu-bwrap.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-if [ -d /usr/lib/aarch64-linux-gnu/qt5 ]; then
-    exec ./bwrap --dev-bind / / --tmpfs /usr/lib/aarch64-linux-gnu/qt5 ./yuzu.sh "$@"
-else
-    if [ -d /usr/lib/aarch64-linux-gnu/qt6 ]; then
-        exec ./bwrap --dev-bind / / --tmpfs /usr/lib/aarch64-linux-gnu/qt6 ./yuzu.sh "$@"
-    fi
-fi
diff --git a/AppImageBuilder/assets_aarch64/yuzu.sh b/AppImageBuilder/assets_aarch64/yuzu.sh
deleted file mode 100755
index 54cf2246e..000000000
--- a/AppImageBuilder/assets_aarch64/yuzu.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-LD_LIBRARY_PATH=/usr/lib/$(uname -m)-linux-gnu:. QT_QPA_PLATFORM=xcb QT_PLUGIN_PATH=. exec ./yuzu "$@"
diff --git a/AppImageBuilder/assets_x86_64/AppRun b/AppImageBuilder/assets_x86_64/AppRun
deleted file mode 100755
index 1faaed208..000000000
--- a/AppImageBuilder/assets_x86_64/AppRun
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-cd "$APPDIR"
-
-# default qt5 location
-if [ -d /usr/lib/x86_64-linux-gnu/qt5 ]; then
-    exec ./yuzu-bwrap.sh "$@"
-else
-    # qt5 on Steam Deck (as qt)
-    if [ -d /usr/lib/qt ]; then
-        exec ./yuzu-bwrap.sh "$@"
-    else
-        # default qt6 location
-        if [ -d /usr/lib/x86_64-linux-gnu/qt6 ]; then
-            exec ./yuzu-bwrap.sh "$@"
-        else
-            # qt6 on Steam Deck
-            if [ -d /usr/lib/qt6 ]; then
-                exec ./yuzu-bwrap.sh "$@"
-            else
-                exec ./yuzu.sh "$@"
-            fi
-        fi
-    fi
-fi
diff --git a/AppImageBuilder/assets/bwrap b/AppImageBuilder/assets_x86_64/bwrap
similarity index 100%
rename from AppImageBuilder/assets/bwrap
rename to AppImageBuilder/assets_x86_64/bwrap
diff --git a/AppImageBuilder/assets/bwrap-info.txt b/AppImageBuilder/assets_x86_64/bwrap-info.txt
similarity index 100%
rename from AppImageBuilder/assets/bwrap-info.txt
rename to AppImageBuilder/assets_x86_64/bwrap-info.txt
diff --git a/AppImageBuilder/assets_x86_64/yuzu-bwrap.sh b/AppImageBuilder/assets_x86_64/yuzu-bwrap.sh
deleted file mode 100755
index 240fe648d..000000000
--- a/AppImageBuilder/assets_x86_64/yuzu-bwrap.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# default qt5 location
-if [ -d /usr/lib/x86_64-linux-gnu/qt5 ]; then
-    exec ./bwrap --dev-bind / / --tmpfs /usr/lib/x86_64-linux-gnu/qt5 ./yuzu.sh "$@"
-else
-    # qt5 on Steam Deck (as qt)
-    if [ -d /usr/lib/qt ]; then
-        exec ./bwrap --dev-bind / / --tmpfs /usr/lib/qt ./yuzu.sh "$@"
-    else
-        # default qt6 location
-        if [ -d /usr/lib/x86_64-linux-gnu/qt6 ]; then
-            exec ./bwrap --dev-bind / / --tmpfs /usr/lib/x86_64-linux-gnu/qt6 ./yuzu.sh "$@"
-        else
-            # qt6 on Steam Deck
-            if [ -d /usr/lib/qt6 ]; then
-                exec ./bwrap --dev-bind / / --tmpfs /usr/lib/qt6 ./yuzu.sh "$@"
-            fi
-        fi
-    fi
-fi
diff --git a/AppImageBuilder/assets_x86_64/yuzu.sh b/AppImageBuilder/assets_x86_64/yuzu.sh
deleted file mode 100755
index a90572a75..000000000
--- a/AppImageBuilder/assets_x86_64/yuzu.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-LD_LIBRARY_PATH=/usr/lib/$(uname -m)-linux-gnu:. QT_QPA_PLATFORM=xcb QT_PLUGIN_PATH=. exec ./yuzu "$@"
diff --git a/AppImageBuilder/build.sh b/AppImageBuilder/build.sh
index 86a10ef2d..79dc76ff8 100755
--- a/AppImageBuilder/build.sh
+++ b/AppImageBuilder/build.sh
@@ -70,7 +70,8 @@ if [ $QTFOUND == "true" ]; then
 
   # Copy QT dependency folders, path determined above
   echo "Copying Qt dependencies..."
-  cp -rv "$QTDIR"/{imageformats,platforms,platformthemes,xcbglintegrations} ./build/
+  mkdir ./build/qt5
+  cp -rv "$QTDIR"/{imageformats,platforms,platformthemes,xcbglintegrations} ./build/qt5/
 
   # Discover indirect dependencies (mostly from runtime-loaded Qt plugins)
   echo "Copying extra dependencies..."