diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh
index c2f3825..41d25eb 100644
--- a/build.sdcard/raspbianStretchDesktop.sh
+++ b/build.sdcard/raspbianStretchDesktop.sh
@@ -113,10 +113,12 @@ if [ "${baseImage}" = "dietpi" ]; then
   sudo pip install setuptools
   # netcat for 00infoBlitz.sh
   sudo apt install -y netcat
-  # install OpenSSH server
+  # install OpenSSH client + server
+  sudo apt install -y openssh-client
   sudo apt install -y openssh-sftp-server
 
 
+
 fi
 
 # special prepare when Raspbian
diff --git a/dietpi/boot/Automation_Custom_PreScript.sh b/dietpi/boot/Automation_Custom_PreScript.sh
deleted file mode 100644
index 68597d4..0000000
--- a/dietpi/boot/Automation_Custom_PreScript.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#as described in https://github.com/Fourdee/DietPi/issues/2488
-mkdir -p /etc/profile.d
-> /etc/profile.d/dietpi-debug.sh
-dietpi-update
-rm  /etc/profile.d/dietpi-debug.sh
\ No newline at end of file
diff --git a/dietpi/boot/dietpi.txt b/dietpi/boot/dietpi.txt
index 447ee15..db56439 100644
--- a/dietpi/boot/dietpi.txt
+++ b/dietpi/boot/dietpi.txt
@@ -71,9 +71,9 @@ AUTO_SETUP_GLOBAL_PASSWORD=dietpi
 # install fail2ban
 AUTO_SETUP_INSTALL_SOFTWARE_ID=73
 # install OpenSSH Client
-AUTO_SETUP_INSTALL_SOFTWARE_ID=0
+# AUTO_SETUP_INSTALL_SOFTWARE_ID=0
 # install OpenSSH Server
-AUTO_SETUP_INSTALL_SOFTWARE_ID=105
+# AUTO_SETUP_INSTALL_SOFTWARE_ID=105
 
 
 
@@ -82,7 +82,7 @@ AUTO_SETUP_INSTALL_SOFTWARE_ID=105
 #        0=none
 #        -1=dropbear
 #        -2=opensshserver
-AUTO_SETUP_SSH_SERVER_INDEX=-2
+AUTO_SETUP_SSH_SERVER_INDEX=-1
 
 #    File Server Selection:
 #        0=none/manual
@@ -173,7 +173,7 @@ CONFIG_PROXY_PASSWORD=
 CONFIG_BOOT_WAIT_FOR_NETWORK=2
 
 #DietPi checks for updates (allows dietpi to check for updates on a daily basis and boot using a <1kb file download.)
-CONFIG_CHECK_DIETPI_UPDATES=1
+CONFIG_CHECK_DIETPI_UPDATES=0
 #	Optional: Automatically update DietPi when updates are available. | requires CONFIG_CHECK_DIETPI_UPDATES=1
 CONFIG_AUTO_DIETPI_UPDATES=0