diff --git a/packaging/linux-common/nymea-app-kiosk.service b/packaging/linux-common/nymea-app-kiosk.service
new file mode 100644
index 00000000..be9bdeae
--- /dev/null
+++ b/packaging/linux-common/nymea-app-kiosk.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=nymea app kiosk
+After=systemd-user-sessions.service
+
+# replaces plymouth-quit since lightdm quits plymouth on its own
+Conflicts=plymouth-quit.service
+After=plymouth-quit.service
+
+# lightdm takes responsibility for stopping plymouth, so if it fails
+# for any reason, make sure plymouth still stops
+OnFailure=plymouth-quit.service
+
+[Service]
+# temporary safety check until all DMs are converted to correct
+# display-manager.service symlink handling
+Environment=QT_QPA_EGLFS_ALWAYS_SET_MODE=1 QT_QPA_PLATFORM=eglfs
+ExecStart=/usr/bin/nymea-app-kiosk-wrapper
+Restart=always
+User=nymea
+Group=nymea
diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control
index 683c8511..f96d773b 100644
--- a/packaging/ubuntu/debian/control
+++ b/packaging/ubuntu/debian/control
@@ -44,7 +44,7 @@ Description: A client app for nymea
  This package will install nymea:app, the client app 
  and main user interface for nymea:core.
 
-Package: nymea-app-kiosk
+Package: nymea-app-kiosk-x11
 Architecture: any
 Section: shells
 Multi-Arch: same
@@ -54,5 +54,16 @@ Depends: nymea-app,
          qtvirtualkeyboard-plugin,
          xinit,
 Provides: lightdm-greeter
+Conflicts: nymea-app-kiosk-wayland
 Description: Run nymea:app in kiosk mode
- This package will install nymea:app in kiosk mode on your machine.
+ This package will install nymea:app in kiosk mode on your machine (using X11 and lightdm).
+
+Package: nymea-app-kiosk-wayland
+Architecture: any
+Section: shells
+Multi-Arch: same
+Depends: nymea-app,
+         qtvirtualkeyboard-plugin,
+Conflicts: nymea-app-kiosk-x11
+Description: Run nymea:app in kiosk mode
+ This package will install nymea:app in kiosk mode on your machine (using wayland).
diff --git a/packaging/ubuntu/debian/nymea-app-kiosk-wayland.install b/packaging/ubuntu/debian/nymea-app-kiosk-wayland.install
new file mode 100644
index 00000000..d025cfe1
--- /dev/null
+++ b/packaging/ubuntu/debian/nymea-app-kiosk-wayland.install
@@ -0,0 +1 @@
+packaging/linux-common/nymea-app-kiosk.service /lib/systemd/system/
diff --git a/packaging/ubuntu/debian/nymea-app-kiosk.install b/packaging/ubuntu/debian/nymea-app-kiosk-x11.install
similarity index 100%
rename from packaging/ubuntu/debian/nymea-app-kiosk.install
rename to packaging/ubuntu/debian/nymea-app-kiosk-x11.install