diff --git a/home.admin/90finishSetup.sh b/home.admin/90finishSetup.sh
index 3309840e7..b68ba0830 100755
--- a/home.admin/90finishSetup.sh
+++ b/home.admin/90finishSetup.sh
@@ -87,4 +87,4 @@ sudo apt-get update
 echo "OK - System is now up to date"
 
 # mark setup is done
-sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
\ No newline at end of file
+sudo sed -i "s/^setupStep=.*/setupStep=90/g" /home/admin/raspiblitz.info
\ No newline at end of file
diff --git a/home.admin/95finalSetup.sh b/home.admin/95finalSetup.sh
index a9dca3443..2dea167e5 100755
--- a/home.admin/95finalSetup.sh
+++ b/home.admin/95finalSetup.sh
@@ -29,7 +29,7 @@ cp $logFile /home/admin/raspiblitz.setup.log
 echo "Setting the Name/Alias/Hostname .."
 sudo /home/admin/config.scripts/lnd.setname.sh ${hostname}
 
-# mark setup is done
+# mark setup is done (100%)
 sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
 
 clear
diff --git a/home.admin/XXcleanHDD.sh b/home.admin/XXcleanHDD.sh
index e37d9ab86..b919b1d3f 100755
--- a/home.admin/XXcleanHDD.sh
+++ b/home.admin/XXcleanHDD.sh
@@ -64,9 +64,7 @@ else
     sudo rm -f -r /mnt/hdd/tor
     sudo rm -f /mnt/hdd/raspiblitz.conf
     sudo rm -f /home/admin/raspiblitz.info
-    # recreate /mnt/hdd/ssh otherwise link with /etc/ssh is broken
-    sudo mkdir /mnt/hdd/ssh
-
+    
 
 fi
 
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index de6033fe2..eabd0724f 100644
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -53,9 +53,7 @@ echo "message=" >> $infoFile
 echo "network=${network}" >> $infoFile
 echo "chain=${chain}" >> $infoFile
 echo "setupStep=${setupStep}" >> $infoFile
-if [ "${setupStep}" != "100" ]; then
-  echo "hostname=${hostname}" >> $infoFile
-fi
+echo "hostname=${hostname}" >> $infoFile
 sudo chmod 777 ${infoFile}
 
 ################################
@@ -227,9 +225,8 @@ if [ ${hddIsAutoMounted} -eq 0 ]; then
 
   # check if HDD contains pre-loaded blockchain data
   echo "Check if HDD contains pre-loaded blockchain data .." >> $logFile
-  # setup running with admin user, but has no permission to read /mnt/hdd/bitcoin/blocks/, sudo needed
-  litecoinDataExists=$(sudo ls /mnt/hdd/litecoin/blocks/blk00000.dat 2>/dev/null | grep -c '.dat')
-  bitcoinDataExists=$(sudo ls /mnt/hdd/bitcoin/blocks/blk00000.dat 2>/dev/null | grep -c '.dat')
+  litecoinDataExists=$(ls /mnt/hdd/litecoin/blocks/blk00000.dat 2>/dev/null | grep -c '.dat')
+  bitcoinDataExists=$(ls /mnt/hdd/bitcoin/blocks/blk00000.dat 2>/dev/null | grep -c '.dat')
 
   # check if node can go into presync (only for bitcoin)
   if [ ${bitcoinDataExists} -eq 1 ]; then
diff --git a/home.admin/assets/bootstrap.service b/home.admin/assets/bootstrap.service
index 953e0a37d..c83db1fe6 100644
--- a/home.admin/assets/bootstrap.service
+++ b/home.admin/assets/bootstrap.service
@@ -14,4 +14,4 @@ ExecStart=/home/admin/_bootstrap.sh
 StandardOutput=journal
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/home.admin/assets/lnd.service b/home.admin/assets/lnd.service
index 345bc9ff5..79a40fdc7 100644
--- a/home.admin/assets/lnd.service
+++ b/home.admin/assets/lnd.service
@@ -22,4 +22,4 @@ Restart=always
 RestartSec=60
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file