diff --git a/meta-oniro-core/classes/oniro-user.bbclass b/meta-oniro-core/classes/oniro-user.bbclass
index 66224e56f9d5dc9cf6b55b8b25eefacaab0a670e..251ae60f40f949e065f3ea17cf3fd91aa731e915 100644
--- a/meta-oniro-core/classes/oniro-user.bbclass
+++ b/meta-oniro-core/classes/oniro-user.bbclass
@@ -8,13 +8,16 @@ inherit extrausers
 # This is a sha512 hash of the word "oniro"
 # To generate a new password run the following command:
 # $ mkpasswd -m sha512crypt
-# WARNING: this is a temporary solution until we have a provisioning solution to set up the initial password
+# WARNING: this is a temporary solution until we have a provisioning solution to set up the initial password 
+
 ONIRO_USER_PASSWORD ?= "\$6\$cI/pmFRW1S8seZ24\$e/7XAuVsOBgoAEmlKQnk54.jQEpRuQmmzik6.1Osaji7ca.04N70Ji.PN86sFXBvqwDGhhSr.jqZsDDA8OVuy."
 
-EXTRA_USERS_PARAMS = "\
-    useradd -p '${ONIRO_USER_PASSWORD}' oniro; \
-"
+ONIRO_USER_USERNAME = "oniro"
 
+EXTRA_USERS_PARAMS = "\
+      useradd -p '${ONIRO_USER_PASSWORD}'  ${ONIRO_USER_USERNAME}; \
+"      
+     
 IMAGE_INSTALL:append = " sudo"
 
 # Add to secure_path:
@@ -26,8 +29,8 @@ IMAGE_INSTALL:append = " sudo"
 # 	- /usr/local/sbin
 # Add oniro to the sudo users
 init_user_oniro () {
-	echo "oniro ALL=(ALL:ALL) ALL" > ${IMAGE_ROOTFS}/etc/sudoers.d/oniro
-	echo "Defaults secure_path=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin" >> ${IMAGE_ROOTFS}/etc/sudoers.d/oniro
+	echo "${ONIRO_USER_USERNAME} ALL=(ALL:ALL) ALL" > ${IMAGE_ROOTFS}/etc/sudoers.d/${ONIRO_USER_USERNAME}
+	echo "Defaults secure_path=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin" >> ${IMAGE_ROOTFS}/etc/sudoers.d/${ONIRO_USER_USERNAME}
 }
 
 ROOTFS_POSTPROCESS_COMMAND:append = " init_user_oniro;"