diff --git a/tasks/install.yml b/tasks/install.yml
index cf4241d..dc52b62 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -23,15 +23,18 @@
 
 - name: Install systemd service files
   block:
-    - template:
+    - name: Install service unit file
+      template:
         src: "{{ sshd_service_template_service }}"
         dest: "/etc/systemd/system/{{ sshd_service }}.service"
       notify: reload_sshd
-    - template:
+    - name: Install instanced service unit file
+      template:
         src: "{{ sshd_service_template_at_service }}"
         dest: "/etc/systemd/system/{{ sshd_service }}@.service"
       notify: reload_sshd
-    - template:
+    - name: Install socket unit file
+      template:
         src: "{{ sshd_service_template_socket }}"
         dest: "/etc/systemd/system/{{ sshd_service }}.socket"
       notify: reload_sshd
diff --git a/tasks/variables.yml b/tasks/variables.yml
index ccd71dd..f0a586f 100644
--- a/tasks/variables.yml
+++ b/tasks/variables.yml
@@ -23,27 +23,35 @@
 
 - name: Override OS defaults
   block:
-    - set_fact:
+    - name: Define sshd_packages
+      set_fact:
         sshd_packages: "{{ __sshd_packages }}"
       when: sshd_packages is not defined
-    - set_fact:
+    - name: Define sshd_config_owner
+      set_fact:
         sshd_config_owner: "{{ __sshd_config_owner }}"
       when: sshd_config_owner is not defined
-    - set_fact:
+    - name: Define sshd_config_group
+      set_fact:
         sshd_config_group: "{{ __sshd_config_group }}"
       when: sshd_config_group is not defined
-    - set_fact:
+    - name: Define sshd_config_mode
+      set_fact:
         sshd_config_mode: "{{ __sshd_config_mode }}"
       when: sshd_config_mode is not defined
-    - set_fact:
+    - name: Define sshd_config_file
+      set_fact:
         sshd_config_file: "{{ __sshd_config_file }}"
       when: sshd_config_file is not defined
-    - set_fact:
+    - name: Define sshd_binary
+      set_fact:
         sshd_binary: "{{ __sshd_binary }}"
       when: sshd_binary is not defined
-    - set_fact:
+    - name: Define sshd_service
+      set_fact:
         sshd_service: "{{ __sshd_service }}"
       when: sshd_service is not defined
-    - set_fact:
+    - name: Define sshd_sftp_server
+      set_fact:
         sshd_sftp_server: "{{ __sshd_sftp_server }}"
       when: sshd_sftp_server is not defined