diff --git a/org.kde.discover.json b/org.kde.discover.json
index b005ef4..0b3648a 100644
--- a/org.kde.discover.json
+++ b/org.kde.discover.json
@@ -1,61 +1,123 @@
 {
     "id": "org.kde.discover",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.9",
     "sdk": "org.kde.Sdk",
     "command": "plasma-discover",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
-    "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--env=QT_QPA_PLATFORM=flatpak" ],
+    "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--share=network", "--env=QT_QPA_PLATFORM=flatpak" ],
 
+    "cleanup": [
+        "/share/bash-completion"
+    ],
+    "build-options" : {
+        "env": {
+            /* Such hack, much bad */
+            "MOUNT_FUSE_PATH": "../tmp/",
+            "BASH_COMPLETIONSDIR": "/app/share/bash-completion/completions"
+        }
+    },
     "modules": [
         {
             "name": "yaml",
             "config-opts": [ "--disable-static", "--enable-x11" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "http://pyyaml.org/download/libyaml/yaml-0.1.7.zip",
                      "sha256": "bd16d734a82ccc806eab7784b3a97ee4773daf359496b298968fc2eedc3d1b19"
                  }
             ]
         },
         {
             "name": "xmlto",
             "sources": [
                 {
                     "type": "archive", "url": "https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2",
                     "sha256": "1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276"
                 }
             ]
         },
         {
-            "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", "-DQT=ON", "-DSTEMMING=OFF"],
+            "config-opts": ["--libdir=lib", "-Denable-qt=true", "-Denable-stemming=false"],
             "name": "appstream",
-            "buildsystem": "cmake-ninja",
+            "buildsystem": "meson",
             "builddir": true,
             "sources": [ { "type": "git", "url": "https://github.com/ximion/appstream.git", "branch": "master" } ]
         },
+
+        {
+            "name": "flatpak",
+            "config-opts": ["--disable-documentation",
+                            "--disable-seccomp",
+                            "--disable-sandboxed-triggers",
+                            "--disable-system-helper"],
+            "make-args": [ "XDG_APP_BINDIR=/usr/bin" ],
+            "cleanup": [ "/etc/profile.d",
+                         "/libexec",
+                         "/lib/systemd",
+                         "/share/dbus-1/interfaces/org.freedesktop.*",
+                         "/share/dbus-1/services/org.freedesktop.*",
+                         "/share/gdm" ],
+            "post-install": [
+                /* These are needed for the triggers */
+                "cp /usr/bin/gtk-update-icon-cache /app/bin",
+                "cp /usr/bin/update-mime-database /app/bin",
+                "cp /usr/bin/update-desktop-database /app/bin"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/flatpak/flatpak"
+                }
+            ],
+            "modules": [
+                {
+                    "name": "libfuse",
+                    "config-opts": ["--disable-util"],
+                    "cleanup": [ "/bin" ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz",
+                            "sha256": "832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874"
+                        }
+                    ]
+                },
+                {
+                    "name": "ostree",
+                    "config-opts": ["--disable-man"],
+                    "cleanup": [ "/bin", "/etc/grub.d", "/libexec" ],
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/ostreedev/ostree.git"
+                        }
+                    ]
+                }
+            ]
+        },
+
         {
             "name": "discover",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib",
-                            "-DBUILD_FlatpakBackend=ON", "-DBUILD_SnapBackend=OFF", "-DBUILD_DummyBackend=ON"],
+                            "-DBUILD_SnapBackend=OFF", "-DBUILD_DummyBackend=ON"],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/discover.git" } ],
             "modules-not-building": [
                 {
                     "name": "snapd-glib",
                     "sources": [ { "type": "git", "url": "https://github.com/snapcore/snapd-glib.git", "branch": "master" } ],
                     "modules": [
                         {
                             "name": "gobject-introspection",
                             "sources": [ { "type": "git", "url": "git://git.gnome.org/gobject-introspection", "branch": "1.52.1" } ]
                         }
                     ]
                 }
             ]
         }
     ]
 }