diff --git a/roles/base/tasks/system_setup/cron.yml b/roles/base/tasks/system_setup/cron.yml
index e90d04e..1de5df2 100644
--- a/roles/base/tasks/system_setup/cron.yml
+++ b/roles/base/tasks/system_setup/cron.yml
@@ -32,12 +32,20 @@
     job: '[[ -f /etc/ssh/ssh_host_* ]] | ssh-keygen -A'
     state: absent
 
-- name: correct crontab for reboot | add
+- name: correct crontab for reboot | remove
   become: true
   become_user: root
   cron:
     name: "generate SSH key on reboot, if missing"
     job: '[[ -f /etc/ssh/ssh_host_* ]] || ssh-keygen -A'
+    state: absent
+
+- name: correct crontab for reboot | add
+  become: true
+  become_user: root
+  cron:
+    name: "generate SSH key on reboot, if missing"
+    job: "[[ -f /etc/ssh/ssh_host_* ]] || ssh-keygen -A && systemctl restart {{ ssh_service }}"
     state: present
     special_time: reboot
 
diff --git a/roles/base/vars/archlinux.yml b/roles/base/vars/archlinux.yml
index 2a6dc99..29ff375 100644
--- a/roles/base/vars/archlinux.yml
+++ b/roles/base/vars/archlinux.yml
@@ -22,4 +22,6 @@ sftp_path: /usr/lib/ssh/sftp-server
 sudo_group: wheel
 vim_package: vim
 
+ssh_service: sshd
+
 update_ca: /usr/bin/update-ca-trust
\ No newline at end of file
diff --git a/roles/base/vars/debian.yml b/roles/base/vars/debian.yml
index 2468c1a..8a9b241 100644
--- a/roles/base/vars/debian.yml
+++ b/roles/base/vars/debian.yml
@@ -23,6 +23,8 @@ sudo_group: sudo
 vim_package: vim
 wireguard_package: wireguard
 
+ssh_service: ssh
+
 update_ca: /usr/sbin/update-ca-certificates
 
 equivalents:
diff --git a/roles/base/vars/ubuntu.yml b/roles/base/vars/ubuntu.yml
index 6b881d4..b4876e1 100644
--- a/roles/base/vars/ubuntu.yml
+++ b/roles/base/vars/ubuntu.yml
@@ -23,4 +23,6 @@ sudo_group: sudo
 vim_package: vim
 wireguard_package: wireguard
 
+ssh_service: ssh
+
 update_ca: /usr/sbin/update-da-certificates
\ No newline at end of file