diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 0657a0bf..e0e21ad9 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -622,6 +622,63 @@ modules:
         url: https://github.com/PCSX2/pcsx2.git
         tag: v1.7.2889
         commit: a6649b2d6b558806fbe7cbaf6296014e3c5c192e
+  # PCSX2 Flathub Workaround - START
+  # This workaround disables the PCSX2 libraries (disable-submodules: true) and install them separately
+  # This is only to make it buildable by the flathub builder as normaly it seems not to be needed
+        disable-submodules: true
+      - type: git
+        dest: "3rdparty/xz/xz"
+        url: https://github.com/PCSX2/xz.git
+        commit: 3d566cd519017eee1a400e7961ff14058dfaf33c
+      - type: git
+        dest: "3rdparty/gtest"
+        url: https://github.com/google/googletest.git
+        commit: e2239ee6043f73722e7aa812a459f54a28552929
+      - type: git
+        dest: "3rdparty/fmt/fmt"
+        url: https://github.com/fmtlib/fmt.git
+        commit: b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+      - type: git
+        dest: "3rdparty/libchdr/libchdr"
+        url: https://github.com/rtissera/libchdr.git
+        commit: 5de1a59019815ccdbba0fe07c71b31406d023248
+      - type: git
+        dest: "3rdparty/wil"
+        url: https://github.com/microsoft/wil.git
+        commit: 3018875eaa4f8e3d86cf2da97fd577bae59f3aec
+      - type: git
+        dest: "3rdparty/cubeb/cubeb"
+        url: https://github.com/mozilla/cubeb.git
+        commit: 773f16b7ea308392c05be3e290163d1f636e6024
+      - type: git
+        dest: "3rdparty/rapidyaml/rapidyaml"
+        url: https://github.com/biojppm/rapidyaml.git
+        commit: 213b201d264139cd1b887790197e08850af628e3
+      - type: git
+        dest: "3rdparty/imgui/imgui"
+        url: https://github.com/ocornut/imgui.git
+        commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1
+      - type: git
+        dest: "3rdparty/glslang/glslang"
+        url: https://github.com/KhronosGroup/glslang.git
+        commit: c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+      - type: git
+        dest: "3rdparty/vulkan-headers"
+        url: https://github.com/KhronosGroup/Vulkan-Headers.git
+        commit: 52a76fd0a693708eb8c25bd0ab7a1008091f64d4
+      - type: git
+        dest: "3rdparty/sdl2/SDL"
+        url: https://github.com/libsdl-org/SDL.git
+        commit: 53dea9830964eee8b5c2a7ee0a65d6e268dc78a1
+      - type: git
+        dest: "3rdparty/libzip/libzip"
+        url: https://github.com/nih-at/libzip.git
+        commit: bdc03ab23b703fcc516436d6ebcbfb6ac4484033
+      - type: git
+        dest: "3rdparty/zstd/zstd"
+        url: https://github.com/facebook/zstd.git
+        commit: e47e674cd09583ff0503f0f6defd6d23d8b718d3
+  # PCSX2 Flathub Workaround - END
 
   # PCSX2 - END
 
@@ -1016,59 +1073,59 @@ modules:
   # PPSSPP Flathub Workaround - START
   # This workaround disables the PPSSPP libraries (disable-submodules: true) and install them separately
   # This is only to make it buildable by the flathub builder as normaly it seems not to be needed
-  - type: git
-    dest: SDL/macOS
-    commit: f19a1d54b8a5af6cc378ea307e0ec676922eb4cc
-    url: https://github.com/hrydgard/ppsspp-mac-sdl
-  - type: git
-    dest: assets/debugger
-    commit: 36ad6b19b22de2075a01a4f0c765e3ef514dc38f
-    url: https://github.com/unknownbrackets/ppsspp-debugger.git
-  - type: git
-    dest: dx9sdk
-    commit: 7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93
-    url: https://github.com/hrydgard/minidx9.git
-  - type: git
-    dest: ext/SPIRV-Cross
-    commit: 9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
-    url: https://github.com/KhronosGroup/SPIRV-Cross.git
-  - type: git
-    dest: ext/armips
-    commit: 7885552b208493a6a0f21663770c446c3ba65576
-    url: https://github.com/Kingcom/armips.git
-  - type: git
-    dest: ext/discord-rpc
-    commit: 963aa9f3e5ce81a4682c6ca3d136cddda614db33
-    url: https://github.com/discordapp/discord-rpc.git
-  - type: git
-    dest: ext/glslang
-    commit: dc11adde23c455a24e13dd54de9b4ede8bdd7db8
-    url: https://github.com/hrydgard/glslang.git
-  - type: git
-    dest: ext/miniupnp
-    commit: 3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
-    url: https://github.com/hrydgard/miniupnp.git
-  - type: git
-    dest: ext/native/tools/prebuilt
-    commit: cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a
-    url: https://github.com/hrydgard/ppsspp-freetype.git
-  - type: git
-    dest: ext/rapidjson
-    commit: 73063f5002612c6bf64fe24f851cd5cc0d83eef9
-    disable-submodules: true
-    url: https://github.com/Tencent/rapidjson.git
-  - type: git
-    dest: ext/zstd
-    commit: a488ba114ec17ea1054b9057c26a046fc122b3b6
-    url: https://github.com/facebook/zstd.git
-  - type: git
-    dest: ffmpeg
-    commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7
-    url: https://github.com/hrydgard/ppsspp-ffmpeg.git
-  - type: git
-    dest: pspautotests
-    commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92
-    url: https://github.com/hrydgard/pspautotests.git
+      - type: git
+        dest: SDL/macOS
+        commit: f19a1d54b8a5af6cc378ea307e0ec676922eb4cc
+        url: https://github.com/hrydgard/ppsspp-mac-sdl
+      - type: git
+        dest: assets/debugger
+        commit: 36ad6b19b22de2075a01a4f0c765e3ef514dc38f
+        url: https://github.com/unknownbrackets/ppsspp-debugger.git
+      - type: git
+        dest: dx9sdk
+        commit: 7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93
+        url: https://github.com/hrydgard/minidx9.git
+      - type: git
+        dest: ext/SPIRV-Cross
+        commit: 9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
+        url: https://github.com/KhronosGroup/SPIRV-Cross.git
+      - type: git
+        dest: ext/armips
+        commit: 7885552b208493a6a0f21663770c446c3ba65576
+        url: https://github.com/Kingcom/armips.git
+      - type: git
+        dest: ext/discord-rpc
+        commit: 963aa9f3e5ce81a4682c6ca3d136cddda614db33
+        url: https://github.com/discordapp/discord-rpc.git
+      - type: git
+        dest: ext/glslang
+        commit: dc11adde23c455a24e13dd54de9b4ede8bdd7db8
+        url: https://github.com/hrydgard/glslang.git
+      - type: git
+        dest: ext/miniupnp
+        commit: 3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
+        url: https://github.com/hrydgard/miniupnp.git
+      - type: git
+        dest: ext/native/tools/prebuilt
+        commit: cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a
+        url: https://github.com/hrydgard/ppsspp-freetype.git
+      - type: git
+        dest: ext/rapidjson
+        commit: 73063f5002612c6bf64fe24f851cd5cc0d83eef9
+        disable-submodules: true
+        url: https://github.com/Tencent/rapidjson.git
+      - type: git
+        dest: ext/zstd
+        commit: a488ba114ec17ea1054b9057c26a046fc122b3b6
+        url: https://github.com/facebook/zstd.git
+      - type: git
+        dest: ffmpeg
+        commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7
+        url: https://github.com/hrydgard/ppsspp-ffmpeg.git
+      - type: git
+        dest: pspautotests
+        commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92
+        url: https://github.com/hrydgard/pspautotests.git
   # PPSSPP Flathub Workaround - END
   
   # PPSSPP - END