diff --git a/automation_tools/update_mame_manifest.sh b/automation_tools/update_mame_manifest.sh
index 366805d..892bc0f 100755
--- a/automation_tools/update_mame_manifest.sh
+++ b/automation_tools/update_mame_manifest.sh
@@ -5,7 +5,7 @@ git clone https://github.com/XargonWan/RetroDECK --depth=1 RetroDECK
 # Creating MAME manifest
 manifest_header="manifest-header.yml"
 mame_module="mame-module.yml"
-mame_manifest="net.retrodeck.mame"
+mame_manifest="net.retrodeck.mame.yml"
 
 sed -n '/cleanup/q;p' RetroDECK/net.retrodeck.retrodeck.yml > "$manifest_header"
 sed -i '/^[[:space:]]*#/d' "$manifest_header"
diff --git a/manifest-header.yml b/manifest-header.yml
index d4631e4..7f40c3c 100644
--- a/manifest-header.yml
+++ b/manifest-header.yml
@@ -4,7 +4,7 @@ runtime-version: "6.5"
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm16
-command: mame
+command: /app/bin/mame
 
 add-extensions:
   org.ppsspp.PPSSPP.Locale:
diff --git a/net.retrodeck.mame b/net.retrodeck.mame
deleted file mode 100644
index d0578a0..0000000
--- a/net.retrodeck.mame
+++ /dev/null
@@ -1,85 +0,0 @@
-app-id: net.retrodeck.mame
-runtime: org.kde.Platform
-runtime-version: "6.5"
-sdk: org.kde.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.llvm16
-command: mame
-
-add-extensions:
-  org.ppsspp.PPSSPP.Locale:
-    directory: share/locale
-    bundle: true
-    no-autodownload: false
-    subdirectories: false
-    autodelete: true
-    locale-subset: true
-
-finish-args:
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --socket=pulseaudio
-  - --share=ipc
-  - --share=network
-  - --device=all
-  - --filesystem=home
-  - --filesystem=/run/media
-  - --filesystem=/media
-  - --filesystem=home/.var/app/com.valvesoftware.Steam
-  - --allow=multiarch
-  - --talk-name=org.freedesktop.ScreenSaver
-  - --talk-name=org.freedesktop.PowerManagement.Inhibit
-  - --talk-name=org.freedesktop.login1.Manager
-  - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor
-  - --filesystem=xdg-run/app/com.discordapp.Discord:create
-  - --allow=bluetooth
-  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.mame
-  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.mame
-  - --unset-env=QEMU_AUDIO_DRV
-
-modules:
-
-  - name: mame
-    buildsystem: simple
-    build-options:
-      no-debuginfo: true
-      strip: true
-    build-commands:
-      - make
-          -j echo $(nproc)
-          CFLAGS+=-Wno-error=restrict
-          USE_QTDEBUG=0 
-          USE_WAYLAND=1
-          USE_SYSTEM_LIB_FLAC=1
-          SDL_INI_PATH='$$HOME/.APP_NAME;/app/share/APP_NAME/ini'
-          LDOPTS=-Wl,-s
-      - install -Dm 0755 mame ${FLATPAK_DEST}/bin/mame
-      - cp COPYING ${FLATPAK_DEST}/bin/
-      - cp uismall.bdf ${FLATPAK_DEST}/bin/
-      - mkdir -p ${FLATPAK_DEST}/share/mame/
-      - cp -r artwork/ ${FLATPAK_DEST}/share/mame/
-      - cp -r bgfx/ ${FLATPAK_DEST}/share/mame/
-      - cp -r ctrlr/ ${FLATPAK_DEST}/share/mame/
-      - mkdir -p ${FLATPAK_DEST}/share/mame/docs/
-      - cp -r docs/legal/ ${FLATPAK_DEST}/share/mame/docs/
-      - cp -r docs/man/ ${FLATPAK_DEST}/share/mame/docs
-      - cp -r hash/ ${FLATPAK_DEST}/share/mame/
-      - cp -r hlsl/ ${FLATPAK_DEST}/share/mame/
-      - cp -r ini/ ${FLATPAK_DEST}/share/mame/
-      - install -Dm 0644 mame.ini ${FLATPAK_DEST}/share/mame/ini/mame.ini
-      - cp -r language/ ${FLATPAK_DEST}/share/mame/
-      - cp -r plugins/ ${FLATPAK_DEST}/share/mame/
-      - cp -r roms/ ${FLATPAK_DEST}/share/mame/
-      - cp -r samples/ ${FLATPAK_DEST}/share/mame/
-    sources:
-      - type: archive
-        url: https://github.com/mamedev/mame/archive/refs/tags/mame0261.tar.gz
-        sha256: 51d5ce1563897709ceb7a924c31a70cc5ff2bec466aab8d0cc9ff3cc72b38899
-      - type: file
-        path: mame-patches/mame.ini
-      - type: patch
-        path: mame-patches/floppy.patch
-      - type: patch
-        path: mame-patches/sound.patch
-      - type: patch
-        path: mame-patches/ym3802.patch
\ No newline at end of file
diff --git a/net.retrodeck.mame.yml b/net.retrodeck.mame.yml
index 706aab8..90ed547 100644
--- a/net.retrodeck.mame.yml
+++ b/net.retrodeck.mame.yml
@@ -4,7 +4,7 @@ runtime-version: "6.5"
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm16
-command: mame
+command: /app/bin/mame
 
 add-extensions:
   org.ppsspp.PPSSPP.Locale:
@@ -37,6 +37,8 @@ finish-args:
   - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.mame
   - --unset-env=QEMU_AUDIO_DRV
 
+modules:
+
   - name: mame
     buildsystem: simple
     build-options: