diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
index b65d089c..ea4685ed 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -20,8 +20,7 @@
         "--filesystem=xdg-videos",
         "--own-name=org.mpris.MediaPlayer2.Clapper",
         "--talk-name=org.gnome.Shell",
-        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0",
-        "--env=GST_VAAPI_ALL_DRIVERS=1"
+        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0"
     ],
     "build-options": {
         "append-path": "/usr/lib/sdk/rust-nightly/bin:/usr/lib/sdk/llvm13/bin",
diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json
index 2446dd6d..42f4cec4 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper.json
@@ -16,8 +16,7 @@
         "--filesystem=xdg-videos",
         "--own-name=org.mpris.MediaPlayer2.Clapper",
         "--talk-name=org.gnome.Shell",
-        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0",
-        "--env=GST_VAAPI_ALL_DRIVERS=1"
+        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0"
     ],
     "modules": [
         "flathub/shared-modules/gudev/gudev.json",
@@ -33,12 +32,15 @@
         "flathub/lib/ffmpeg.json",
         "flathub/lib/uchardet.json",
         "flathub/gstreamer-1.0/gstreamer.json",
-        "testing/gtk4.json",
-        "testing/libadwaita.json",
+        "flathub/lib/gtk4.json",
+        "flathub/lib/libadwaita.json",
         "testing/gtuber.json",
         {
             "name": "clapper",
             "buildsystem": "meson",
+            "config-opts": [
+                "-Dc_args=\"-DHAVE_GST_PATCHES=1\""
+            ],
             "sources": [
                 {
                     "type": "dir",
diff --git a/pkgs/flatpak/flathub b/pkgs/flatpak/flathub
index 4f3bee93..a4125b42 160000
--- a/pkgs/flatpak/flathub
+++ b/pkgs/flatpak/flathub
@@ -1 +1 @@
-Subproject commit 4f3bee93b765ae5cf64cdb4422daa1352c954c1b
+Subproject commit a4125b426459453c1476858c1ac3f89bf1ece17c
diff --git a/pkgs/flatpak/testing/gtk4.json b/pkgs/flatpak/testing/gtk4.json
deleted file mode 100644
index 53451707..00000000
--- a/pkgs/flatpak/testing/gtk4.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "gtk",
-    "buildsystem": "meson",
-    "build-options": {
-        "build-args": [
-            "--share=network"
-        ]
-    },
-    "config-opts": [
-        "--buildtype=release",
-
-        "-Dwin32-backend=false",
-        "-Dmacos-backend=false",
-        "-Dmedia-ffmpeg=disabled",
-        "-Dprint-cups=disabled",
-        "-Dintrospection=enabled",
-        "-Ddemos=false",
-        "-Dbuild-examples=false",
-        "-Dbuild-tests=false"
-    ],
-    "cleanup": [
-        "/bin/gtk4-builder-tool",
-        "/bin/gtk4-encode-symbolic-svg"
-    ],
-    "sources": [
-        {
-            "type": "git",
-            "url": "https://gitlab.gnome.org/GNOME/gtk.git",
-            "tag": "4.6.4",
-            "commit": "1e6bad6c4f412dc0eb7b2f508cb4465929a04303"
-        }
-    ]
-}
diff --git a/pkgs/flatpak/testing/libadwaita.json b/pkgs/flatpak/testing/libadwaita.json
deleted file mode 100644
index a46b4add..00000000
--- a/pkgs/flatpak/testing/libadwaita.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "libadwaita",
-    "buildsystem": "meson",
-    "config-opts": [
-        "--buildtype=release",
-        "--wrap-mode=nofallback",
-        "-Dintrospection=enabled",
-        "-Dvapi=false",
-        "-Dgtk_doc=false",
-        "-Dtests=false",
-        "-Dexamples=false"
-    ],
-    "sources": [
-        {
-            "type": "git",
-            "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
-            "tag": "1.1.1",
-            "commit": "5ec9f624b23bf78b29dd708e77ccdfcee0a9867a"
-        }
-    ]
-}