diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 2532e1bb..58dab9bb 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -8,13 +8,13 @@ sdk-extensions:
   #- org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx - Removed, check if it's not breaking something else
 base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
 base-version: 5.15-22.08                    # Needed for Yuzu
-add-extensions:
-  org.freedesktop.Platform.ffmpeg-full:
-    directory: lib/ffmpeg
-    add-ld-path: .
-    version: '22.08'
-    autodownload: true
-    autodelete: false
+# add-extensions:
+#   org.freedesktop.Platform.ffmpeg-full:
+#     directory: lib/ffmpeg
+#     add-ld-path: .
+#     version: '22.08'
+#     autodownload: true
+#     autodelete: false
 command: retrodeck.sh
 
 finish-args:
@@ -226,21 +226,21 @@ modules:
   # https://gitlab.com/es-de/emulationstation-de
 
   #This is disabled because we added the extension (line 11), check if the videos are ok.
-  # - name: ffmpeg
-  #   config-opts:
-  #     - --disable-static
-  #     - --disable-programs
-  #     - --disable-doc
-  #     - --enable-gpl
-  #     - --enable-shared
-  #     - --enable-libvorbis
-  #     - --enable-libopus
-  #     - --enable-libvpx
-  #     - --enable-postproc
-  #   sources:
-  #     - type: git
-  #       url: https://github.com/FFmpeg/FFmpeg.git
-  #       tag: n5.1.1
+  - name: ffmpeg
+    config-opts:
+      - --disable-static
+      - --disable-programs
+      - --disable-doc
+      - --enable-gpl
+      - --enable-shared
+      - --enable-libvorbis
+      - --enable-libopus
+      - --enable-libvpx
+      - --enable-postproc
+    sources:
+      - type: git
+        url: https://github.com/FFmpeg/FFmpeg.git
+        tag: n5.1.1
 
   - name: freeimage
     no-autogen: true
@@ -826,7 +826,8 @@ modules:
       - -DUSE_NATIVE_INSTRUCTIONS=OFF
       - -DUSE_PRECOMPILED_HEADERS=OFF
       - -DUSE_SYSTEM_CURL=ON
-      - -DUSE_SYSTEM_FFMPEG=ON
+      # Disabled this to force RPCS3 to use our built FFMPEG
+      - -DUSE_SYSTEM_FFMPEG=OFF
       - -DUSE_SYSTEM_LIBPNG=ON
       - -DUSE_SYSTEM_ZLIB=ON
       - -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi