diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index ff6becefa1..63639493a4 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -62,29 +62,26 @@ jobs:
     secrets: inherit
   flatpak:
     name: "Flatpak"
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-      fail-fast: false
-    steps:
-    - name: Install dependencies
-      run: |
-        apt-get update
-        apt-get install -y python3-pip
-        pip3 install meson
-    env:
-      date:
-      ver:
-      ver_pure:
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47
       options: --privileged
       volumes:
         - /usr/local/lib/android:/usr/local/lib/android
         - /usr/share/dotnet:/usr/share/dotnet
         - /opt/ghc:/opt/ghc1
         - /usr/local/share/boost:/usr/local/share/boost1
+    strategy:
+      matrix:
+        variant:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.variant.runner }}
+    env:
+      date:
+      ver:
+      ver_pure:
     steps:
     - name: "Remove unneeded stuff to free disk space"
       run:
@@ -102,12 +99,12 @@ jobs:
         echo "ver_pure=$ver_pure" >> $GITHUB_ENV
         echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
       shell: bash
-    - uses: flatpak/flatpak-github-actions/flatpak-builder@master
+    - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak
         manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
         cache: true
-        arch: ${{ matrix.arch }}
+        arch: ${{ matrix.variant.arch }}
         upload-artifact: false
     - name: Deploy Flatpak to nightly release
       if: ${{github.ref == 'refs/heads/main'}}