diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 7c58b7ea..8f2e3263 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -856,13 +856,43 @@ modules:
 
   # Duckstation - START
   # https://github.com/flathub/org.duckstation.DuckStation
+  # Disabled until we completely switch to QT6
 
-  - name: duckstation
+  # - name: duckstation
+  #   buildsystem: cmake-ninja
+  #   no-make-install: true
+  #   builddir: true
+  #   config-opts:
+  #     - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+  #     - -DUSE_EGL=ON
+  #     - -DUSE_SDL2=ON
+  #     - -DUSE_WAYLAND=ON
+  #     - -DUSE_X11=ON
+  #     - -DUSE_DRMKMS=ON
+  #     - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+  #   post-install:
+  #     - install -m755 bin/duckstation-qt /app/bin
+  #     - cp -r ../data/* bin/translations /app/bin
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/stenzek/duckstation.git
+  #       commit: 6f709468601183083b8581d4952aaba7baf77084
+  #       # Cloning dep/msvc/qt is only necessary for Windows
+  #       disable-submodules: true
+  
+  # Duckstation - END
+
+  # Duckstation-DontUpdate - START
+  # Old version moved to QT6 so it's either this or AppImage
+  # But AppImage is a single one that keep getting updated at the same link so the sha (that's mandatory) will break the build
+  # So yeah we're stuck with this for a while
+
+  - name: duckstation-DontUpdate
     buildsystem: cmake-ninja
     no-make-install: true
     builddir: true
     config-opts:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DCMAKE_BUILD_TYPE=Release
       - -DUSE_EGL=ON
       - -DUSE_SDL2=ON
       - -DUSE_WAYLAND=ON
@@ -870,16 +900,36 @@ modules:
       - -DUSE_DRMKMS=ON
       - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
     post-install:
-      - install -m755 bin/duckstation-qt /app/bin
+      - install -m 755 -t /app/bin/ bin/duckstation-nogui bin/duckstation-qt
+      - |-
+        for px in 16 32 48 64 128 256; do
+          install -Dm644 ../extras/icons/icon-${px}px.png /app/share/icons/hicolor/${px}x${px}/apps/org.duckstation.DuckStation.png
+        done
       - cp -r ../data/* bin/translations /app/bin
     sources:
       - type: git
         url: https://github.com/stenzek/duckstation.git
-        commit: 6f709468601183083b8581d4952aaba7baf77084
-        # Cloning dep/msvc/qt is only necessary for Windows
-        disable-submodules: true
-  
-  # Duckstation - END
+        commit: 3fb61865e505ba639609fbf16cb8bdf5c66e020c
+
+  # Duckstation-DontUpdate - END
+
+  # Duckstation-AppImage - START
+  # https://github.com/stenzek/duckstation/releases/tag/preview
+
+  # - name: Duckstation-AppImage
+  #   buildsystem: simple
+  #   build-commands:
+  #     - chmod +x DuckStation-*.AppImage
+  #     - ./DuckStation-x64*.AppImage --appimage-extract
+  #     - mkdir -p "${FLATPAK_DEST}/duckstation"
+  #     - cp -r squashfs-root/* "${FLATPAK_DEST}/duckstation"
+  #     - ln -s "${FLATPAK_DEST}/duckstation/usr/bin/duckstation" "${FLATPAK_DEST}/bin/duckstation"
+  #   sources:
+  #     - type: file
+  #       url: https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage
+  #       sha256: a107d1837df020cb4e7b8a542059665428883af69c1cf063edd29e2d75634867
+
+  # Duckstation-AppImage - END
 
   # Cemu - START
   # https://github.com/cemu-project/Cemu/releases