diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 20efe4e8..98cdec10 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1207,80 +1207,7 @@ modules:
   # SOLARUS - END
 
   # GZDoom - Start
-  # https://github.com/ZDoom/gzdoom
-  # When updating:
-  # - take the latest commit from the repo
-  # - update gzdoom.sf2 link and sha
-  # - pray
-
-  - name: libsndfile
-    buildsystem: autotools
-    sources:
-      - type: archive
-        url: >-
-          https://github.com/libsndfile/libsndfile/releases/download/1.2.2/libsndfile-1.2.2.tar.xz
-        sha256: 3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e
-        x-checker-data:
-          type: anitya
-          project-id: 13277
-          stable-only: true
-          url-template: >-
-            https://github.com/libsndfile/libsndfile/releases/download/$version/libsndfile-$version.tar.xz
-  - name: game-music-emu
-    buildsystem: cmake-ninja
-    config-opts:
-      - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-    sources:
-      - type: archive
-        url: >-
-          https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.3.tar.gz
-        sha256: 626e8a104e0dadd10ef6519a67aca880c7b40f81471659f1935b61754e12fc7b
-        x-checker-data:
-          type: anitya
-          project-id: 866
-          stable-only: true
-          url-template: >-
-            https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$version.tar.gz
-  - name: zmusic
-    buildsystem: cmake-ninja
-    config-opts:
-      - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-    sources:
-      - type: archive
-        url: https://github.com/zdoom/ZMusic/archive/1.1.12.tar.gz
-        sha256: da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
-        x-checker-data:
-          type: anitya
-          project-id: 153600
-          stable-only: true
-          url-template: https://github.com/zdoom/ZMusic/archive/$version.tar.gz
-  - name: gzdoom
-    buildsystem: cmake-ninja
-    config-opts:
-      - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-    cleanup:
-      - /lib/*.a
-      - /lib/*.la
-      - /lib/pkgconfig
-      - /include
-    sources:
-      - type: git
-        url: https://github.com/zdoom/gzdoom.git
-        commit: 05167fd4ef4388a511bad51b8a4304079c805424
-        x-checker-data:
-          type: anitya
-          project-id: 17531
-          stable-only: true
-          tag-template: g$version
-      - type: file
-        url: https://github.com/ZDoom/gzdoom/raw/b91300316875266e852e8b5890e188870189d4a6/soundfont/gzdoom.sf2
-        sha256: a9058609b07c1f0e0c1f420e76c2e80ba78136e6173e836caab51ffb13e552f1
-    post-install:
-      - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2
-    modules:
-      - rd-submodules/shared-modules/linux-audio/libinstpatch.json
-      - rd-submodules/shared-modules/linux-audio/fluidsynth2.json
-
+  - rd-submodules/shared-modules/gzdoom/gzdoom.json
   # GZDoom - END
   
   # MAME - Start
diff --git a/rd-submodules/ryujinx b/rd-submodules/ryujinx
index 35d4fce1..ea1dae93 160000
--- a/rd-submodules/ryujinx
+++ b/rd-submodules/ryujinx
@@ -1 +1 @@
-Subproject commit 35d4fce1b9959b8568838659ea7e8c239139d3c8
+Subproject commit ea1dae930a6f61388c2b5e05f95bb6ed0120926e