diff --git a/org.ppsspp.PPSSPP.json b/org.ppsspp.PPSSPP.json
deleted file mode 100644
index 92738b9..0000000
--- a/org.ppsspp.PPSSPP.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "app-id": "org.ppsspp.PPSSPP",
-  "branch": "stable",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "21.08",
-  "sdk": "org.freedesktop.Sdk",
-  "rename-icon": "ppsspp",
-  "command": "PPSSPPSDL",
-  "finish-args": [
-    "--device=all",
-    "--filesystem=host:ro",
-    "--socket=pulseaudio",
-    "--socket=x11",
-    "--share=network"
-  ],
-  "modules": [
-    "shared-modules/glu/glu-9.json",
-    "shared-modules/glew/glew.json",
-    {
-      "name": "ppsspp",
-      "buildsystem": "cmake",
-      "build-options": {
-        "arch": {
-          "aarch64": {
-            "env": {
-              "EXTRA_OPTS":"-DUSING_GLES2=ON"
-            }
-          }
-        }
-      },
-      "post-install": [
-        "mv ${FLATPAK_DEST}/share/applications/{PPSSPPSDL,${FLATPAK_ID}}.desktop",
-        "desktop-file-edit --set-name=PPSSPP --set-icon=${FLATPAK_ID} ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop",
-        "install -Dm644 appdata.xml ${FLATPAK_DEST}/share/appdata/${FLATPAK_ID}.appdata.xml"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/hrydgard/ppsspp.git",
-          "tag": "v1.11.3"
-        },
-        {
-          "type": "file",
-          "path": "appdata.xml"
-        }
-      ]
-    }
-  ]
-}
diff --git a/org.ppsspp.PPSSPP.yml b/org.ppsspp.PPSSPP.yml
new file mode 100644
index 0000000..9a732c8
--- /dev/null
+++ b/org.ppsspp.PPSSPP.yml
@@ -0,0 +1,56 @@
+app-id: org.ppsspp.PPSSPP
+runtime: org.freedesktop.Platform
+runtime-version: '21.08'
+sdk: org.freedesktop.Sdk
+rename-icon: ppsspp
+rename-desktop-file: PPSSPPSDL.desktop
+command: PPSSPPSDL
+finish-args:
+  - --device=all
+  - --filesystem=host:ro
+  - --socket=pulseaudio
+  - --socket=x11
+  - --share=network
+modules:
+  - shared-modules/glu/glu-9.json
+  - shared-modules/glew/glew.json
+  - name: ppsspp
+    buildsystem: simple
+    build-options:
+      arch:
+        aarch64:
+          env:
+            EXTRA_OPTS: '-DUSING_GLES2=ON'
+    build-commands:
+      - cd ffmpeg && rm -r linux && ../build-ffmpeg.sh
+      - cmake 
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo 
+        -DCMAKE_INSTALL_PREFIX=${FLATPAK_DEST} 
+        ${EXTRA_OPTS} 
+        .
+      - make -j${FLATPAK_BUILDER_N_JOBS} && make install
+    post-install:
+      - desktop-file-edit --set-name=PPSSPP --set-icon=${FLATPAK_ID} ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
+      - install -Dm644 appdata.xml ${FLATPAK_DEST}/share/appdata/${FLATPAK_ID}.appdata.xml
+    sources:
+      - type: git
+        url: https://github.com/hrydgard/ppsspp.git
+        tag: v1.11.3
+
+      - type: file
+        path: appdata.xml
+
+      - type: script
+        dest-filename: build-ffmpeg.sh
+        only-arches: 
+          - aarch64
+        commands:
+          - sed -i 's/GENERAL=/GENERAL_NO=/' linux_arm64.sh
+          - ./linux_arm64.sh
+
+      - type: script
+        dest-filename: build-ffmpeg.sh
+        only-arches: 
+          - x86_64
+        commands:
+          - ./linux_x86-64.sh
diff --git a/shared-modules b/shared-modules
index b0d4c06..ae74ea6 160000
--- a/shared-modules
+++ b/shared-modules
@@ -1 +1 @@
-Subproject commit b0d4c06751d0451c0a6cd9672b3132d6152f332c
+Subproject commit ae74ea6577e92d3dd768575214a45df8c7b45a32