diff --git a/rootfs/opt/setup_rootfs.sh b/rootfs/opt/setup_rootfs.sh
index 6fda0a7..a28df18 100755
--- a/rootfs/opt/setup_rootfs.sh
+++ b/rootfs/opt/setup_rootfs.sh
@@ -14,7 +14,7 @@ fi
 
 custom_repo="https://shimboot.ading.dev/debian"
 custom_repo_domain="shimboot.ading.dev"
-sources_entry="deb [trusted=yes] ${custom_repo} ${release_name} main"
+sources_entry="deb [trusted=yes arch=amd64] ${custom_repo} ${release_name} main"
 
 #add shimboot repos
 echo -e "${sources_entry}\n$(cat /etc/apt/sources.list)" > /etc/apt/sources.list
@@ -56,12 +56,16 @@ ff02::2 ip6-allrouters
 END
 
 echo "Enter a root password:"
-passwd root
+while ! passwd root; do
+  echo "Failed to set password, please try again."
+done
 
 read -p "Enter the username for the user account: " username
 useradd -m -s /bin/bash -G sudo $username
 echo "Enter the password for ${username}:"
-passwd $username
+while ! passwd $username; do
+  echo "Failed to set password, please try again."
+done
 
 #clean apt caches
 apt-get clean
\ No newline at end of file