diff --git a/discover/wrapper.sh b/discover/wrapper.sh
deleted file mode 100644
--- a/discover/wrapper.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-XDG_DATA_HOME=~/.local/share/ plasma-discover
-
diff --git a/org.kde.discover.json b/org.kde.discover.json
--- a/org.kde.discover.json
+++ b/org.kde.discover.json
@@ -4,13 +4,11 @@
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
-    "command": "/app/bin/discoverwrapper.sh",
+    "command": "/app/bin/plasma-discover.run",
     "tags": ["nightly"],
     "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--share=network",
-        "--filesystem=home",
-        "--filesystem=~/.local/share/flatpak",
-        "--filesystem=xdg-data"
+        "--filesystem=xdg-data/flatpak"
     ],
 
     "cleanup": [
@@ -22,63 +20,45 @@
             "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": ["--libdir=lib", "-Denable-qt=true", "-Dstemming=false", "-Dqt=true"],
             "name": "appstream",
+            "config-opts": [ "--libdir=lib", "-Dstemming=false", "-Dqt=true" ],
             "buildsystem": "meson",
             "builddir": true,
             "sources": [ { "type": "git", "url": "https://github.com/ximion/appstream.git", "branch": "master" } ],
+
             "modules": [
                 {
-                    "name": "glib",
-                    "config-opts": [ "--with-pcre=system", "--with-python=python3" ],
-                    "ensure-writable": [ "/share/glib-2.0/codegen/*.pyc" ],
-                    "cleanup-platform": [ "/share/glib-2.0/codegen",
-                                        "/bin/gdbus-codegen",
-                                        "/bin/glib-*",
-                                        "/bin/gobject-query",
-                                        "/bin/gresource",
-                                        "/bin/gtester*"
-                                    ],
-                    "sources": [
+                    "name": "gobject-introspection",
+                    "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/gobject-introspection", "branch": "gnome-3-30" } ],
+
+                    "modules": [
+                        {
+                            "name": "glib",
+                            "config-opts": [ "--with-pcre=system", "--with-python=python3" ],
+                            "ensure-writable": [ "/share/glib-2.0/codegen/*.pyc" ],
+                            "cleanup-platform": [
+                                "/share/glib-2.0/codegen",
+                                "/bin/gdbus-codegen",
+                                "/bin/glib-*",
+                                "/bin/gobject-query",
+                                "/bin/gresource",
+                                "/bin/gtester*"
+                            ],
+                            "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/glib.git", "branch": "glib-2-58" } ]
+                        },
+
                         {
-                            "type": "git",
-                            "url": "https://gitlab.gnome.org/GNOME/glib.git"
+                            "name": "glib-networking",
+                            "buildsystem": "meson",
+                            "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/glib-networking.git", "branch": "glib-2-58" } ]
                         }
                     ]
-                },
-                {
-                    "name": "gobject-introspection",
-                    "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/gobject-introspection", "branch": "1.56.1" } ]
                 }
             ]
         },
-	{
-	    "name": "glib-networking",
-            "buildsystem": "meson",
-	    "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/glib-networking.git", "branch": "glib-2-56" } ]
-	},
 
         {
             "name": "flatpak",
@@ -97,65 +77,51 @@
                 "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",
-                    "branch": "1.0.6"
-                }
-            ],
+            "sources": [ { "type": "git", "url": "https://github.com/flatpak/flatpak", "branch": "flatpak-1.0.x" } ],
+
             "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": [
+                    "sources": [ { "type": "git", "url": "https://github.com/ostreedev/ostree.git", "tag": "v2018.9" } ],
+
+                    "modules": [
                         {
-                            "type": "git",
-                            "url": "https://github.com/ostreedev/ostree.git"
+                            "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": "wrapper",
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -m775 discoverwrapper.sh ${FLATPAK_DEST}/bin"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "path": "discover/wrapper.sh",
-                    "dest-filename": "discoverwrapper.sh"
-                }
-            ]
-        },
+
         {
             "name": "discover",
-            "config-opts": ["-DENABLE_TESTING=OFF" ,
-                            "-DBUILD_SnapBackend=OFF", "-DBUILD_DummyBackend=ON"],
+            "config-opts": [ "-DENABLE_TESTING=OFF", "-DBUILD_DummyBackend=ON" ],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [
-                { "type": "git", "url": "git://anongit.kde.org/discover.git" }
+                { "type": "git", "url": "git://anongit.kde.org/discover.git" },
+                {
+                    "type": "script",
+                    "dest-filename": "plasma-discover.run",
+                    "commands": [ "FLATPAK_USER_DIR=~/.local/share/flatpak exec plasma-discover" ]
+                }
             ],
-            "modules-not-building": [
+            "post-install": [ "install ../plasma-discover.run /app/bin/" ],
+            "modules": [
                 {
                     "name": "snapd-glib",
+                    "disabled": true,
                     "sources": [ { "type": "git", "url": "https://github.com/snapcore/snapd-glib.git", "branch": "master" } ]
                 }
             ]