diff --git a/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
index 866974c134604a8c214f21d6faab6edefacff0ed..6f578a15dee6efdb5d52610549f3f4e817e1971b 100644
--- a/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
+++ b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
@@ -1,6 +1,7 @@
 [core]
 idle-time=0
 require-input=false
+shell=kiosk-shell.so
 
 #gbm-format=argb8888
 idle-time=0
diff --git a/recipes-seconorth/guf-show-demo/files/guf-show-demo.service b/recipes-seconorth/guf-show-demo/files/guf-show-demo.service
index 7f1c5fb94e3e179cafe824f5b486553109af0275..6969f93a985fd8e9ebcc220cece4385524fa9e37 100644
--- a/recipes-seconorth/guf-show-demo/files/guf-show-demo.service
+++ b/recipes-seconorth/guf-show-demo/files/guf-show-demo.service
@@ -1,14 +1,15 @@
 [Unit]
 Description=GuF Trade Show Demo
 
-After=weston@root.service
-Requires=weston@root.service
+After=weston.service
+Requires=weston.service
 Conflicts=getty@tty1.service
 
+
 [Service]
 Type=simple
 
-Environment=XDG_RUNTIME_DIR=/var/run/user/0
+Environment=XDG_RUNTIME_DIR=/var/run/user/1000
 Environment=QT_QPA_FONTDIR=/usr/share/fonts/truetype
 Environment=QT_QPA_PLATFORM=wayland
 
@@ -21,5 +22,12 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=guf-show-demo
 
+# The user to run Weston as.
+User=weston
+Group=weston
+
+# Make sure the working directory is the users home directory
+WorkingDirectory=/home/weston
+
 [Install]
 WantedBy=multi-user.target