diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7028087..170afe6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,23 +49,22 @@ jobs:
 
   build-flatpak:
     runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08
+      options: --privileged
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
         lfs: true
-    - name: Install prerequisites
-      run: sudo apt-get update -y && sudo apt-get install -y
-        appstream-util
-        flatpak-builder
     - name: Validate metainfo
       run: appstream-util validate
         ${{github.workspace}}/data/packaging/xyz.safeworlds.midiconn.metainfo.xml
-    - name: Install flatpak prerequisites
-      run: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo &&
-        sudo flatpak install -y flathub org.freedesktop.Sdk//23.08 org.freedesktop.Platform//23.08
     - name: Build flatpak
-      run: flatpak-builder build/flatpak ${{github.workspace}}/data/packaging/xyz.safeworlds.midiconn.yml
+      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        manifest-path: ${{github.workspace}}/data/packaging/xyz.safeworlds.midiconn.yml
+        cache-key: flatpak-builder-${{ github.sha }}
 
   build-windows:
     runs-on: windows-latest