diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ba9bc13642d03aa29605e19fdbbbb6823017e06c..b15e25af555280a50dbf06a051f9982c5be92012 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -843,7 +843,10 @@ if [ -n "$CUSTOM_SETUP" ]; then
     chroot "$rootdir" gdebi -n /tmp/"$(basename $CUSTOM_SETUP)"
 fi
 
-chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential openssh-server
+if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "mesh" ]]; then
+    chroot "$rootdir" apt-get install -y openssh-server
+fi
+chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager iputils-ping
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name nano man ntp
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 1a908a41595103be3dbb2dd36253491a01496d95..20db2dd50492667746ebcf0e06b30c677d4cfeb8 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -113,17 +113,6 @@ function change_avahi_name {
     echo $"avahi name changed to P${PEER_ID}.local" >> $INSTALL_LOG
 }
 
-function regenerate_ssh_host_keys {
-    echo $"Regenerating ssh host keys" >> $INSTALL_LOG
-    rm -f /etc/ssh/ssh_host_*
-    dpkg-reconfigure openssh-server
-    echo $'ssh host keys regenerated' >> $INSTALL_LOG
-    # remove small moduli
-    awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
-    mv ~/moduli /etc/ssh/moduli
-    echo $'ssh small moduli removed' >> $INSTALL_LOG
-}
-
 function configure_zeronet {
     sed -i "s|ExecStart=.*|ExecStart=/usr/bin/python zeronet.py --ip_external P${PEER_ID}.local --trackers_file $MESH_INSTALL_DIR/zeronet/bootstrap|g" /etc/systemd/system/zeronet.service
     echo $"zeronet daemon updated to P${PEER_ID}.local" >> $INSTALL_LOG
@@ -805,7 +794,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
     create_ram_disk 1
     setup_amnesic_data
     change_avahi_name
-    regenerate_ssh_host_keys
     if [ $ENABLE_ZERONET ]; then
         configure_zeronet_blog
         configure_zeronet_mail