diff --git a/.github/workflows/build_Flatpak.yaml b/.github/workflows/build_Flatpak.yaml
new file mode 100644
index 000000000..a51c115df
--- /dev/null
+++ b/.github/workflows/build_Flatpak.yaml
@@ -0,0 +1,40 @@
+on:
+  push:
+#    branches: [main]
+  pull_request:
+name: Build Flatpak app
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-24.04
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
+      options: --privileged
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install rustup
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+      - name: Run rustup
+        run: |
+          . "$HOME/.cargo/env"
+          rustup toolchain install stable
+
+      - name: Clone Flatpak repo
+        run: |
+          git clone --recurse-submodules https://github.com/C0rn3j/com.github.taiko2k.tauonmb.git tauon-flatpak
+          cd tauon-flatpak; git checkout tekoreless
+
+      - name: "[DEBUG] List all files"
+        run: find .
+
+      # https://github.com/marketplace/actions/flatpak-builder
+      - name: Build Flatpak
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+        with:
+          bundle: tauonmb.flatpak
+          manifest-path: tauon-flatpak/com.github.taiko2k.tauonmb.json
+          cache-key: flatpak-builder-${{ github.sha }}