diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 863c12323..3bb501299 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,6 +86,7 @@ jobs:
           # Process AppDir
           /usr/local/linuxdeployqt-x86_64.AppImage \
             appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
+            -exclude-libs=libQt5Pdf.so,libQt5Qml.so,libQt5QmlModels.so,libQt5Quick.so,libQt5VirtualKeyboard.so \
             -bundle-non-qt-libs \
             -executable=appdir/usr/bin/crashpad_handler \
             -executable=appdir/usr/bin/minidump_stackwalk \
diff --git a/docker/scripts/build_crashpad.sh b/docker/scripts/build_crashpad.sh
index 843dd3754..59b2356dc 100644
--- a/docker/scripts/build_crashpad.sh
+++ b/docker/scripts/build_crashpad.sh
@@ -23,7 +23,9 @@ export PATH
 # Toolchain can be controlled with env vars CC, CXX and AR
 mkdir crashpad
 cd crashpad
-fetch crashpad
+git clone --depth 1 https://github.com/olive-editor/crashpad.git
+gclient config https://github.com/olive-editor/crashpad.git
+gclient sync
 cd crashpad
 # TODO: Do we want to set any special args here? For example:
 # gn gen --args="target_cpu=\"x64\" is_debug=true" out/Default
diff --git a/docker/scripts/build_olive.sh b/docker/scripts/build_olive.sh
index 6b58d588c..6f79a67ac 100644
--- a/docker/scripts/build_olive.sh
+++ b/docker/scripts/build_olive.sh
@@ -9,9 +9,25 @@ cmake --build .
 
 cmake --install app --prefix appdir/usr
 
+# TODO: Can the following libs be excluded?
+#libQt5DBus.so,\
+#libQt5MultimediaGstTools.so,\
+#libQt5MultimediaWidgets.so,\
+
 /usr/local/linuxdeployqt-x86_64.AppImage \
   appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
   -appimage \
+  -exclude-libs=\
+libQt5Pdf.so,\
+libQt5Qml.so,\
+libQt5QmlModels.so,\
+libQt5Quick.so,\
+libQt5Svg.so,\
+libQt5VirtualKeyboard.so \
+  -bundle-non-qt-libs \
+  -executable=appdir/usr/bin/crashpad_handler \
+  -executable=appdir/usr/bin/minidump_stackwalk \
+  -executable=appdir/usr/bin/olive-crashhandler \
   --appimage-extract-and-run
 
 ./Olive*.AppImage --appimage-extract-and-run --version