diff --git a/roles/firmware/tasks/main.yml b/roles/firmware/tasks/main.yml
index 4aebf3fdd..811635d1b 100644
--- a/roles/firmware/tasks/main.yml
+++ b/roles/firmware/tasks/main.yml
@@ -1,18 +1,18 @@
-- name: Include older RPi Firmware
+- name: Backup/Download firmware (for RPi internal WiFi)
   include_tasks: install.yml
   when: rpi_firmware_downloaded is undefined
 
-- name: Install check-firmware service files
+- name: 'Install from template: check-firmware.service, check-firmware.sh & fw_warn.sh'
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     mode: "{{ item.mode }}"
   with_items:
-    - { src: 'fw_warn.sh', dest: '/etc/profile.d/', mode: '0644' }
     - { src: 'check-firmware.service', dest: '/etc/systemd/system/', mode: '0644' }
     - { src: 'check-firmware.sh', dest: '/usr/sbin/', mode: '0755' }
+    - { src: 'fw_warn.sh', dest: '/etc/profile.d/', mode: '0644' }
 
-- name: Enable and Start check-firmware.service
+- name: Enable & (Re)start check-firmware.service
   systemd:
     name: check-firmware.service
     daemon_reload: yes