diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro
index 42ab8401..c548e068 100644
--- a/libnymea-app-core/libnymea-app-core.pro
+++ b/libnymea-app-core/libnymea-app-core.pro
@@ -147,8 +147,3 @@ HEADERS += \
     configuration/mqttpolicies.h \
     models/devicemodel.h \
     system/systemcontroller.h
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}
diff --git a/packaging/linux-common/lightdm/40-nymea-app-kiosk.conf b/packaging/linux-common/lightdm/40-nymea-app-kiosk.conf
new file mode 100644
index 00000000..779b2d31
--- /dev/null
+++ b/packaging/linux-common/lightdm/40-nymea-app-kiosk.conf
@@ -0,0 +1,4 @@
+[Seat:*]
+autologin-user=nymea
+user-session=nymea-app-kiosk
+
diff --git a/packaging/linux-common/nymea-app-kiosk-wrapper b/packaging/linux-common/nymea-app-kiosk-wrapper
new file mode 100755
index 00000000..a0526ff0
--- /dev/null
+++ b/packaging/linux-common/nymea-app-kiosk-wrapper
@@ -0,0 +1,2 @@
+#!/bin/sh
+nymea-app --kiosk
diff --git a/packaging/linux-common/nymea-app-kiosk.desktop b/packaging/linux-common/nymea-app-kiosk.desktop
new file mode 100644
index 00000000..23817b2b
--- /dev/null
+++ b/packaging/linux-common/nymea-app-kiosk.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=XSession
+Exec=/usr/bin/openbox --startup /usr/bin/nymea-app-kiosk-wrapper
+DesktopNames=nymea:app
+
diff --git a/packaging/linux-common/nymea-app-kiosk.service b/packaging/linux-common/nymea-app-kiosk.service
deleted file mode 100644
index c2ec3f24..00000000
--- a/packaging/linux-common/nymea-app-kiosk.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=nymea frontend app
-Documentation=https://github.com/guh/mea
-After=network.target
-Wants=network-online.target
-
-[Service]
-User = nymea
-Group = nymea
-ExecStart = /usr/bin/xinit /usr/bin/nymea-app --kiosk -- :0 -nolisten tcp vt7
-StandardOutput=journal
-StandardError=journal
-Restart=on-failure
-Type=simple
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/packaging/linux-common/nymea-app.service b/packaging/linux-common/nymea-app.service
deleted file mode 100644
index 94c46853..00000000
--- a/packaging/linux-common/nymea-app.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=nymea frontend app
-Documentation=https://github.com/guh/mea
-After=network.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/usr/bin/mea -platform webgl
-StandardOutput=journal
-StandardError=journal
-Restart=on-failure
-Type=simple
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control
index 60b3b44b..54df5ba7 100644
--- a/packaging/ubuntu/debian/control
+++ b/packaging/ubuntu/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.0.0),
 
 Package: nymea-app
 Architecture: any
-Section: tools
+Section: x11
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -44,3 +44,11 @@ Description: An open source IoT server - daemon
  .
  This package will install nymea:app.
 
+Package: nymea-app-kiosk
+Architecture: any
+Section: shells
+Multi-Arch: same
+Depends: nymea-app,
+         openbox,
+Description: Run nymea:app in kiosk mode
+ This package will install nymea:app in kiosk mode on your machine.
diff --git a/packaging/ubuntu/debian/nymea-app-kiosk.install b/packaging/ubuntu/debian/nymea-app-kiosk.install
new file mode 100644
index 00000000..187a18da
--- /dev/null
+++ b/packaging/ubuntu/debian/nymea-app-kiosk.install
@@ -0,0 +1,3 @@
+packaging/linux-common/nymea-app-kiosk.desktop /usr/share/xsessions/
+packaging/linux-common/lightdm/40-nymea-app-kiosk.conf /usr/share/lightdm/lightdm.conf.d/
+packaging/linux-common/nymea-app-kiosk-wrapper /usr/bin/
diff --git a/packaging/ubuntu/debian/nymea-app.install b/packaging/ubuntu/debian/nymea-app.install
index d025cfe1..a08b219e 100644
--- a/packaging/ubuntu/debian/nymea-app.install
+++ b/packaging/ubuntu/debian/nymea-app.install
@@ -1 +1,3 @@
-packaging/linux-common/nymea-app-kiosk.service /lib/systemd/system/
+usr/bin/nymea-app
+usr/share/applications/nymea-app.desktop
+usr/share/icons/*
diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules
index 5522e76a..2732fc43 100755
--- a/packaging/ubuntu/debian/rules
+++ b/packaging/ubuntu/debian/rules
@@ -11,8 +11,11 @@ export DH_VERBOSE=1
 #	sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@
 
 
-#override_dh_install: $(PREPROCESS_FILES:.in=)
-#	dh_install
+#override_dh_install:
+#	dh_install --fail-missing
+
+override_dh_missing:
+	dh_missing --fail-missing
 
 #override_dh_auto_test:
 #	LD_LIBRARY_PATH=`pwd`/libnymea-mqtt/ dh_auto_test