diff --git a/.github/workflows/build-gui-release-binaries.yml b/.github/workflows/build-gui-release-binaries.yml
index 53345060e..8b3b392d9 100644
--- a/.github/workflows/build-gui-release-binaries.yml
+++ b/.github/workflows/build-gui-release-binaries.yml
@@ -168,7 +168,8 @@ jobs:
               "type": "file",
               "path": $deb_path
             } |
-            .modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path
+            .modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path |
+            .modules[0].sources[2].path = $PWD + "/" + .modules[0].sources[2].path
           ' < flatpak/org.eigenwallet.app.json > target/manifest.json
 
           outdir=target/flatpak-repo
diff --git a/dev-scripts/publish_flatpak.sh b/dev-scripts/publish_flatpak.sh
index dd871cf96..cfd6230f7 100755
--- a/dev-scripts/publish_flatpak.sh
+++ b/dev-scripts/publish_flatpak.sh
@@ -233,7 +233,8 @@ jq --arg deb_path "$DEB_FILE" --arg PWD "$PWD" '
         "type": "file",
         "path": $deb_path
     } |
-    .modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path
+    .modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path |
+    .modules[0].sources[2].path = $PWD + "/" + .modules[0].sources[2].path
 ' "$MANIFEST_FILE" > "$TEMP_MANIFEST"
 
 MANIFEST_FILE="$TEMP_MANIFEST"
diff --git a/flatpak/org.eigenwallet.app.json b/flatpak/org.eigenwallet.app.json
index 33763d7ff..86dddbade 100644
--- a/flatpak/org.eigenwallet.app.json
+++ b/flatpak/org.eigenwallet.app.json
@@ -3,7 +3,7 @@
   "runtime": "org.gnome.Platform",
   "runtime-version": "47",
   "sdk": "org.gnome.Sdk",
-  "command": "unstoppableswap-gui-rs",
+  "command": "unstoppableswap-gui-rs.flatpak.sh",
   "finish-args": [
     "--socket=wayland",
     "--socket=fallback-x11",
@@ -28,12 +28,17 @@
         {
           "type": "file",
           "path": "flatpak/org.eigenwallet.app.appdata.xml"
+        },
+        {
+          "type": "file",
+          "path": "flatpak/unstoppableswap-gui-rs.flatpak.sh"
         }
       ],
       "build-commands": [
         "ar -x *.deb",
         "tar -xf data.tar.gz",
         "install -Dm755 usr/bin/unstoppableswap-gui-rs -t /app/bin",
+        "install -Dm755 *.flatpak.sh                   -t /app/bin",
         "install -Dm644 *.appdata.xml                  -t /app/share/metainfo",
         "mv             usr/share/icons                   /app/share"
       ]
diff --git a/flatpak/unstoppableswap-gui-rs.flatpak.sh b/flatpak/unstoppableswap-gui-rs.flatpak.sh
new file mode 100755
index 000000000..51ce78547
--- /dev/null
+++ b/flatpak/unstoppableswap-gui-rs.flatpak.sh
@@ -0,0 +1,9 @@
+#!/bin/sh -x
+
+# Work around https://github.com/eigenwallet/core/issues/665
+WEBKIT_DISABLE_DMABUF_RENDERER=1
+export WEBKIT_DISABLE_DMABUF_RENDERER
+
+# This executed in flatpak, with /app/bin in $PATH
+# flatpak runs execlp("${manifest.command}"), replicate this
+exec unstoppableswap-gui-rs "$@"