diff --git a/components/users.xml b/components/users.xml
index e126074..902f47c 100644
--- a/components/users.xml
+++ b/components/users.xml
@@ -1,6 +1,6 @@
 <image>
 	<users profiles="Azure,AWSEC2,OpenStack,LiveInstall">
-		<!-- The password here does not matter, it will be erased in config.sh -->
-		<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
+        <user name="root" groups="root" home="/root" password="fedora_rocks!" pwdformat="plain" />
+        <user name="riscv" groups="riscv,wheel" home="/home/riscv" password="fedora_rocks!" pwdformat="plain" />
 	</users>
 </image>
diff --git a/config.sh b/config.sh
index b333d50..1045a2e 100755
--- a/config.sh
+++ b/config.sh
@@ -33,12 +33,6 @@ echo 'uninitialized' > /etc/machine-id
 ## remove random seed, the newly installed instance should make its own
 rm -f /var/lib/systemd/random-seed
 
-#======================================
-# Delete & lock the root user password
-#--------------------------------------
-passwd -d root
-passwd -l root
-
 #======================================
 # Setup default services
 #--------------------------------------