diff --git a/documentation/INSTALL_RHEL9.md b/documentation/INSTALL_RHEL9.md
index b503115..26d70ce 100644
--- a/documentation/INSTALL_RHEL9.md
+++ b/documentation/INSTALL_RHEL9.md
@@ -215,8 +215,9 @@ Download the ostree server and run it.
 CONTAINER_IMAGE_FILE="$(composer-cli compose image "${BUILDID}")"
 IMAGEID="$(podman load < "${BUILDID}-container.tar" | grep -o -P '(?<=sha256[@:])[a-z0-9]*')"
 echo "Using image with id = $IMAGEID"
+podman stop -i minimal-microshift-server
 podman rm -i minimal-microshift-server
-podman run -d --name=minimal-microshift-server -p 8085:8080 ${IMAGEID}
+podman run -d --rm --name=minimal-microshift-server -p 8085:8080 ${IMAGEID}
 ```
 
 ## Build the ISO
@@ -257,4 +258,6 @@ sed -i.${EPOCHREALTIME:-bak} "s|__MICROSHIFT_PULL_SECRET__|$MICROSHIFT_PULL_SECR
 sudo dnf install -y lorax pykickstart
 ksvalidator kiosk.ks || echo "Kickstart has errors, please fix them!"
 rm -f kiosk.iso && mkksiso -r "inst.ks inst.stage2" --ks kiosk.ks "${BUILDID}-installer.iso" kiosk.iso
+ls -lh kiosk.iso
+file kiosk.iso
 ```
diff --git a/imagebuilder/kiosk.ks b/imagebuilder/kiosk.ks
index 764e68e..cf58e1e 100644
--- a/imagebuilder/kiosk.ks
+++ b/imagebuilder/kiosk.ks
@@ -43,6 +43,18 @@ logvol /  --fstype="xfs" --size=1 --grow --name=root --vgname=system
 part pv.02 --size=1 --grow --ondisk=vdb
 volgroup data pv.02
 
+##
+## Alternative partitioning on only one disk
+##
+#zerombr
+#clearpart --all --initlabel
+#reqpart --add-boot
+#part pv.01 --size=10G --ondisk=sda
+#volgroup system pv.01
+#logvol /  --fstype="xfs" --size=1 --grow --name=root --vgname=system
+#part pv.02 --size=1 --grow --ondisk=sda
+#volgroup data pv.02
+
 ##
 ## Network configuration
 ##
diff --git a/rpms/SOURCES/user-template b/rpms/SOURCES/user-template
index d36c8e9..58b128a 100644
--- a/rpms/SOURCES/user-template
+++ b/rpms/SOURCES/user-template
@@ -9,5 +9,5 @@ id='${ID}'
 version-id='${VERSION_ID}'
 
 [User]
-Session=gnome
+Session=redhat-kiosk-sampleapp
 Icon=${HOME}/.face
diff --git a/rpms/SPECS/kiosk-config.spec b/rpms/SPECS/kiosk-config.spec
index 6c14ed9..b1cd5ab 100644
--- a/rpms/SPECS/kiosk-config.spec
+++ b/rpms/SPECS/kiosk-config.spec
@@ -68,7 +68,7 @@ install -m 0644 -D user-template %{buildroot}/etc/accountsservice/user-templates
 
 %pre
 getent group kiosk >/dev/null 2>&1 || groupadd kiosk
-getent passwd kiosk >/dev/null 2>&1 || useradd -N -g kiosk -d /home/kiosk -m kiosk
+getent passwd kiosk >/dev/null 2>&1 || useradd -r -N -g kiosk -d /home/kiosk -m kiosk
 
 %post
 %systemd_user_post com.redhat.Kiosk.SampleApp.service