diff --git a/kube/com.kolabnow.kube.json b/kube/com.kolabnow.kube.json
index 4ddfb13..505fda4 100644
--- a/kube/com.kolabnow.kube.json
+++ b/kube/com.kolabnow.kube.json
@@ -1,47 +1,57 @@
 {
     "id": "com.kolabnow.kube",
     "branch": "master",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
     "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
-    "tags": ["kolabnow"],
     "desktop-file-name-prefix": "Kolab Now ",
+    "tags": ["kolabnow"],
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host",
         "--filesystem=/tmp",
         "--share=network",
         "--env=SASL_PATH=/usr/lib/sasl2/"
     ],
     "separate-locales": false,
     "cleanup": ["/include", "*.a", "*.la", "*.prl"],
     "modules": [
         "kubedeps.json",
         {
-            "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib",
-                            "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
+            "config-opts": [
+                "-DENABLE_TESTING=OFF",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_C_COMPILER=/usr/bin/clang",
+                "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"
+            ],
             "name": "sink",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ]
         },
         {
             "config-opts": [
                 "-DENABLE_TESTING=OFF",
                 "-DCMAKE_INSTALL_LIBDIR=lib",
-                "-DAVAILABLE_ACCOUNT_PLUGINS=kolabnow",
+                "-DCMAKE_C_COMPILER=/usr/bin/clang",
+                "-DCMAKE_CXX_COMPILER=/usr/bin/clang++",
                 "-DKUBE_APPLICATION_ID=com.kolabnow.kube",
+                "-DAVAILABLE_ACCOUNT_PLUGINS=kolabnow",
                 "-DKUBE_DESKTOPFILE_COMMENT=\"Send, receive and manage your Kolab Now mail with Kube\"",
                 "-DKUBE_DESKTOPFILE_CATEGORIES=Qt;Office;Network;Email;"
             ],
             "name": "kube",
             "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ]
+            "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ],
+            "post-install": [
+                "rm -rf /app/include",
+                "rm -rf /app/lib/*.la /app/lib/*.a /app/lib/*.prl "
+            ]
         },
         "wrapperscript.json"
     ]
 }
diff --git a/kube/com.kubeproject.kube.json b/kube/com.kubeproject.kube.json
index 8c2f498..4efe50e 100644
--- a/kube/com.kubeproject.kube.json
+++ b/kube/com.kubeproject.kube.json
@@ -1,47 +1,54 @@
 {
     "id": "com.kubeproject.kube",
     "branch": "master",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
     "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
     "desktop-file-name-prefix": "(Nightly) ",
     "tags": ["nightly"],
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host",
         "--filesystem=/tmp",
         "--share=network",
         "--env=SASL_PATH=/usr/lib/sasl2/"
     ],
     "separate-locales": false,
+    "cleanup": ["/include", "*.a", "*.la", "*.prl"],
     "modules": [
         "kubedeps.json",
         {
-            "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
+            "config-opts": [
+                "-DENABLE_TESTING=OFF",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_C_COMPILER=/usr/bin/clang",
+                "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"
+            ],
             "name": "sink",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ]
         },
         {
             "config-opts": [
+                "-DENABLE_TESTING=OFF",
                 "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DCMAKE_C_COMPILER=/usr/bin/clang",
                 "-DCMAKE_CXX_COMPILER=/usr/bin/clang++",
                 "-DKUBE_APPLICATION_ID=com.kubeproject.kube"
             ],
             "name": "kube",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ],
             "post-install": [
                 "rm -rf /app/include",
                 "rm -rf /app/lib/*.la /app/lib/*.a /app/lib/*.prl "
             ]
         },
         "wrapperscript.json"
     ]
 }