diff --git a/includes/gen-postcommon9.ksi b/includes/gen-postcommon9.ksi
index f7affec..38816b8 100644
--- a/includes/gen-postcommon9.ksi
+++ b/includes/gen-postcommon9.ksi
@@ -2,8 +2,9 @@
 # Setting correct yum variable to use raspberrypi kernel repo
 #echo "generic" > /etc/dnf/vars/kvariant
 #
-# Creating rocky user
-/usr/sbin/useradd -m -p '$6$2cuo4i8NE.Gbde2m$jQ3tX0SeDp0ZSvGZUUKAWg774vPeWhcYYpBaJkMNjULBm.Q41NwwWt6kCoWjF07dEQGCn7U/Ei.wQHyhACqk9.' rocky
+# Creating rocky user and add to wheel group
+/sbin/useradd -c "Rocky Linux default user" -G wheel -m -U rocky
+echo "rockylinux" | passwd --stdin  rocky
 # Generic efi filename for VMs
 mkdir -p /boot/efi/EFI/BOOT
 if [ -d /boot/efi/EFI/rocky/ ] && [ -f /boot/efi/EFI/rocky/grubaa64.efi ];then
diff --git a/includes/gen-rockycommon9.ksi b/includes/gen-rockycommon9.ksi
index 7f4969d..cc68670 100644
--- a/includes/gen-rockycommon9.ksi
+++ b/includes/gen-rockycommon9.ksi
@@ -1,4 +1,4 @@
-rootpw --iscrypted $6$2cuo4i8NE.Gbde2m$jQ3tX0SeDp0ZSvGZUUKAWg774vPeWhcYYpBaJkMNjULBm.Q41NwwWt6kCoWjF07dEQGCn7U/Ei.wQHyhACqk9.
+rootpw --lock
 %include includes/basecommon9.ksi
 %include includes/gen-partitions9.ksi
 %include includes/packages9.ksi