diff --git a/installer/distro-setup.sh b/installer/distro-setup.sh
index 1673e532..38a42e1c 100755
--- a/installer/distro-setup.sh
+++ b/installer/distro-setup.sh
@@ -8,22 +8,16 @@ mount  --bind  /data/home/    /home/
 
 # Create default user: user,admin,support
 echo "Setting user user password as user"
-useradd -G systemd-journal -s /bin/bash -m user
-echo GDNT2023J8e+76 | passwd user --stdin
+useradd -G systemd-journal -s /bin/bash -m -p"\$1\$B.GUzaBW\$jt9Nea3tta9zAxiB2lLdS/" user
 #echo "user    ALL=(ALL)       ALL" >> /etc/sudoers
-echo GDNT2023J8e+76 | passwd --stdin
 
 echo "Setting user admin password as admin"
-useradd -G systemd-journal -s /bin/bash -m admin
-echo GDNT202342U9.x | passwd admin --stdin
+useradd -G systemd-journal -s /bin/bash -m -p"\$1\$bn33nXye\$UcX0RqOF1cQrMiLZPRkcd/" admin
 echo "%admin    ALL=(ALL)       ALL" >> /etc/sudoers
-echo GDNT202342U9.x | passwd --stdin
 
 echo "Setting user support password as support"
-useradd -G systemd-journal -s /bin/bash -m support
-echo GDNT2023QV3:vI | passwd support --stdin
+useradd -G systemd-journal -s /bin/bash -m -p"\$1\$yN9/QmOg\$jluyG1/JyKzIQrB69FDxs1" support
 echo "%support    ALL=(ALL)       ALL" >> /etc/sudoers
-echo GDNT2023QV3:vI | passwd --stdin
 
 # umount  /home/
 
diff --git a/installer/install.sh b/installer/install.sh
index 19a8cd8f..f7580e22 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -317,7 +317,7 @@ mount -t ext4 ${blk_dev}${exp_part_tsg_os_data} ${distro_mnt}/data
 
 echo "Setting up TSG-OS sysroot .."
 chroot ${distro_mnt} /distro-setup.sh ${blk_dev}
-
+rm -f ${distro_mnt}/distro-setup.sh
 read_device_type
 install_patches
 append_kernel_args