diff --git a/.github/workflows/build_flatpak.yml b/.github/workflows/build_flatpak.yml
index 686f36782e..1321584e05 100644
--- a/.github/workflows/build_flatpak.yml
+++ b/.github/workflows/build_flatpak.yml
@@ -8,11 +8,11 @@ jobs:
     name: "build-packages"
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+      image: ghcr.io/bottlesdevs/flatpak-github-actions:gnome-nightly-with-wine
       options: --privileged
     steps:
     - uses: actions/checkout@v4
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: bottles.flatpak
         manifest-path: build-aux/com.usebottles.bottles.Devel.json
diff --git a/build-aux/com.usebottles.bottles.Devel.json b/build-aux/com.usebottles.bottles.Devel.json
index 8fcf441952..84b24ec183 100644
--- a/build-aux/com.usebottles.bottles.Devel.json
+++ b/build-aux/com.usebottles.bottles.Devel.json
@@ -4,7 +4,7 @@
     "runtime": "org.gnome.Platform",
     "base": "org.winehq.Wine",
     "base-version": "stable-24.08",
-    "runtime-version": "47",
+    "runtime-version": "master",
     "command": "bottles",
     "finish-args": [
         "--allow=devel",
@@ -33,11 +33,11 @@
     "add-extensions": {
         "org.gnome.Platform.Compat.i386": {
             "directory": "lib/i386-linux-gnu",
-            "version": "47"
+            "version": "master"
         },
         "org.gnome.Platform.Compat.i386.Debug": {
             "directory": "lib/debug/lib/i386-linux-gnu",
-            "version": "47",
+            "version": "master",
             "no-autodownload": true
         },
         "com.valvesoftware.Steam.CompatibilityTool": {