diff --git a/provision-os.sh b/provision-os.sh
index 9f2f0d7..e07a0ae 100644
--- a/provision-os.sh
+++ b/provision-os.sh
@@ -115,7 +115,8 @@ curl -s https://raw.githubusercontent.com/kubesail/pibox-os/main/setup.sh | bash
 echo "TCPKeepAlive yes" >> /etc/ssh/sshd_config
 touch /boot/ssh
 touch /boot/refresh-ssh-certs
-rm -vf ~/.ssh/*
+rm -vf /home/pi/.ssh/*
+sed -i s/PasswordAuthentication\ no/PasswordAuthentication\ yes/ /etc/ssh/sshd_config
 
 # Clean bash history
 history -c && history -w
diff --git a/setup.sh b/setup.sh
index 6d6e500..e629a43 100644
--- a/setup.sh
+++ b/setup.sh
@@ -99,6 +99,9 @@ if [[ ! -f $FB_PATH ]]; then
 fi
 chown -R kubesail-agent: /opt/kubesail/
 cat <<'EOF' > /etc/systemd/system/pibox-framebuffer.service
+[Unit]
+Requires=multi-user.target
+After=multi-user.target
 [Service]
 ExecStart=/opt/kubesail/pibox-framebuffer
 Restart=always
@@ -110,4 +113,4 @@ EOF
 systemctl daemon-reload
 
 systemctl enable pibox-first-boot.service
-systemctl enable pibox-framebuffer.service
\ No newline at end of file
+systemctl enable pibox-framebuffer.service