diff --git a/roles/harden_ssh/handlers/main.yaml b/roles/harden_ssh/handlers/main.yaml
new file mode 100644
index 0000000..11f7fa4
--- /dev/null
+++ b/roles/harden_ssh/handlers/main.yaml
@@ -0,0 +1,13 @@
+---
+
+- name: Restart ssh-server Debian
+  ansible.builtin.service:
+    name: sshd
+    state: restarted
+  changed_when: false # It's just a handler, no need to increase 'changed' counter
+
+- name: Restart ssh-server Ubuntu
+  ansible.builtin.service:
+    name: ssh
+    state: restarted
+  changed_when: false
diff --git a/roles/harden_ssh/tasks/main.yaml b/roles/harden_ssh/tasks/main.yaml
index a1486dd..76d5ef0 100644
--- a/roles/harden_ssh/tasks/main.yaml
+++ b/roles/harden_ssh/tasks/main.yaml
@@ -6,6 +6,7 @@
     dest: /etc/ssh/sshd_config.d/hardened_sshd.conf
     mode: u=rw,g=r,o=r
   when: ansible_facts['distribution'] == 'Ubuntu'
+  notify: Restart ssh-server Ubuntu
 
 - name: Configure ssh-server daemon
   ansible.builtin.copy:
@@ -13,6 +14,7 @@
     dest: /etc/ssh/sshd_config.d/hardened_sshd.conf
     mode: u=rw,g=r,o=r
   when: ansible_facts['distribution'] == 'Debian'
+  notify: Restart ssh-server Debian
 
 - name: Configure ssh client
   remote_user: ansible
@@ -21,16 +23,16 @@
     dest: /etc/ssh/ssh_config.d/hardened_ssh.conf
     mode: u=rw,g=r,o=r
 
-- name: Restart ssh-server Debian
-  remote_user: ansible
-  ansible.builtin.service:
-    name: sshd
-    state: restarted
-  when: ansible_facts['distribution'] == 'Debian'
-
-- name: Restart ssh-server Ubuntu
-  remote_user: ansible
-  ansible.builtin.service:
-    name: ssh
-    state: restarted
-  when: ansible_facts['distribution'] == 'Ubuntu'
+    #- name: Restart ssh-server Debian
+    #  remote_user: ansible
+    #  ansible.builtin.service:
+    #    name: sshd
+    #    state: restarted
+    #  when: ansible_facts['distribution'] == 'Debian'
+    #
+    #- name: Restart ssh-server Ubuntu
+    #  remote_user: ansible
+    #  ansible.builtin.service:
+    #    name: ssh
+    #    state: restarted
+    #  when: ansible_facts['distribution'] == 'Ubuntu'