diff --git a/meta/main.yml b/meta/main.yml
index 87933d8..7b8e18c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -32,8 +32,8 @@ galaxy_info:
   galaxy_tags:
   - networking
   - system
-  - SSH
-  - OpenSSH
+  - ssh
+  - openssh
   - sshd
   - server
   - ubuntu
diff --git a/tasks/install.yml b/tasks/install.yml
index cf4241d..030177a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -2,7 +2,7 @@
 
 - name: OS is supported
   assert:
-    that: __sshd_os_supported == True
+    that: __sshd_os_supported|bool
 
 - name: Install ssh packages
   package:
@@ -23,19 +23,22 @@
 
 - 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
-  when: sshd_install_service
+  when: sshd_install_service|bool
 
 - name: Service enabled and running
   service:
@@ -43,13 +46,13 @@
     enabled: true
     state: started
   when:
-    - sshd_manage_service
+    - sshd_manage_service|bool
     - ansible_virtualization_type|default(None) != 'docker'
     - ansible_connection != 'chroot'
 
 # Due to ansible bug 21026, cannot use service module on RHEL 7
 - name: Enable service in chroot
-  command: systemctl enable {{ sshd_service }}
+  command: systemctl enable {{ sshd_service }}  # noqa 303
   when:
     - ansible_connection == 'chroot'
     - ansible_os_family == 'RedHat'
diff --git a/tasks/main.yml b/tasks/main.yml
index cea29a2..54b708e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - include_tasks: sshd.yml
-  when: sshd_enable
+  when: sshd_enable|bool
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