diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 7d8eea41..1054e8fd 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,7 +1,3 @@
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-phone.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-phone)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-phone
-        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ GROUP_EXECUTE GROUP_READ
-        DESTINATION ${BIN_INSTALL_DIR})
 install(PROGRAMS kwinwrapper DESTINATION ${BIN_INSTALL_DIR})
 
 configure_file(plasma-mobile.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-mobile.desktop)
diff --git a/bin/kwinwrapper b/bin/kwinwrapper
index 986b9e33..3ab50502 100755
--- a/bin/kwinwrapper
+++ b/bin/kwinwrapper
@@ -2,24 +2,25 @@
 
 [ -f /etc/profile ] && . /etc/profile
 
-export $(dbus-launch)
 export QT_QPA_PLATFORM=wayland
 export QT_QPA_PLATFORMTHEME=KDE
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-export XDG_CURRENT_DESKTOP=KDE
 export EGL_PLATFORM=wayland
 
-export KDE_FULL_SESSION=1
-export KDE_SESSION_VERSION=5
-export PLASMA_PLATFORM=phone
 export QT_QUICK_CONTROLS_STYLE=Plasma
 export QT_ENABLE_GLYPH_CACHE_WORKAROUND=1
 export QT_QUICK_CONTROLS_MOBILE=true
+export PLASMA_PLATFORM=phone:handset
+
+export GRID_UNIT_PX=25
+export FORCE_RIL_NUM_MODEMS=1
+export PLASMA_DEFAULT_SHELL=org.kde.plasma.phone
 
 # work around to fix : https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1507584
-if [ -d /usr/lib/arm-linux-gnueabihf/libhybris-egl ]; then
-    export LD_LIBRARY_PATH=/usr/lib/arm-linux-gnueabihf/libhybris-egl:$LD_LIBRARY_PATH
+_ARCH=arm-linux-gnueabihf
+if [ -d /usr/lib/$_ARCH/libhybris-egl ]; then
+    export LD_LIBRARY_PATH=/usr/lib/$_ARCH/libhybris-egl:$LD_LIBRARY_PATH
 fi
 
 touch /tmp/simplelogin_starting
-kwin_wayland --xwayland --libinput --inputmethod maliit-server plasma-phone
+startplasma-wayland --xwayland --libinput --inputmethod maliit-server --exit-with-session=/usr/lib/$_ARCH/libexec/startplasma-waylandsession
diff --git a/bin/plasma-phone.cmake b/bin/plasma-phone.cmake
deleted file mode 100644
index 75b0b9b5..00000000
--- a/bin/plasma-phone.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# Script that starts the Plasma phone UI.
-#
-# Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-
-unset QT_QPA_EGLFS_DEPTH
-unset QT_QPA_EGLFS_HIDECURSOR
-unset QT_COMPOSITOR_NEGATE_INVERTED_Y
-
-export EGL_PLATFORM=wayland
-export QT_QPA_PLATFORM=wayland
-export QT_QPA_PLATFORMTHEME=KDE
-export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-export XDG_CURRENT_DESKTOP=KDE
-
-export KDE_FULL_SESSION=1
-export KDE_SESSION_VERSION=5
-export PLASMA_PLATFORM=phone:handset
-export QT_QUICK_CONTROLS_STYLE=Plasma
-
-export GRID_UNIT_PX=25
-export FORCE_RIL_NUM_MODEMS=1
-export QT_QUICK_CONTROLS_MOBILE=true
-
-@CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
-
-# HACK: FIXME: This should autostart when required but appearantly there is some async magic which prevents it gettings started.
-# start signond service
-dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.StartServiceByName string:com.google.code.AccountsSSO.SingleSignOn uint32:0
-
-# start mission control
-dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.StartServiceByName string:org.freedesktop.Telepathy.MissionControl5 uint32:0
-
-#start kded5
-@CMAKE_INSTALL_FULL_BINDIR@/kded5 &
-
-# start polkit authentication agent
-@CMAKE_INSTALL_FULL_LIBEXECDIR@/polkit-kde-authentication-agent-1 &
-
-# start powerdevil
-@CMAKE_INSTALL_FULL_LIBEXECDIR@/org_kde_powerdevil &
-
-exec /usr/bin/plasmashell -p org.kde.plasma.phone 2>/tmp/plasmashell_logs