diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index 77cb834..0af0b40 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -29,7 +29,8 @@
   retries: 3
   until: apt_result is succeeded
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
 
 # Configure APT mirrors on Debian Stretch
diff --git a/roles/borgbackup_client/tasks/main.yml b/roles/borgbackup_client/tasks/main.yml
index 728d253..fcf1226 100644
--- a/roles/borgbackup_client/tasks/main.yml
+++ b/roles/borgbackup_client/tasks/main.yml
@@ -108,7 +108,8 @@
     state: started
     enabled: true
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     key: 10-borgmatic
diff --git a/roles/borgbackup_server/tasks/main.yml b/roles/borgbackup_server/tasks/main.yml
index 9c77196..ff31c07 100644
--- a/roles/borgbackup_server/tasks/main.yml
+++ b/roles/borgbackup_server/tasks/main.yml
@@ -36,7 +36,8 @@
     group: "{{ borg_server_group }}"
     mode: u=rwx,g=,o=
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages:
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 5484f88..38d3a55 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -51,7 +51,8 @@
     dest: /usr/local/bin/docker-compose
     mode: "0755"
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages:
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 146b93c..7a3af07 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -148,7 +148,8 @@
     group: www-data
     mode: 0644
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages:
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
index d141ecc..f4a5b04 100644
--- a/roles/prometheus/tasks/main.yml
+++ b/roles/prometheus/tasks/main.yml
@@ -109,7 +109,8 @@
     enabled: true
     state: started
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages:
diff --git a/roles/prometheus_federate/tasks/main.yml b/roles/prometheus_federate/tasks/main.yml
index 02ae85e..cc96e65 100644
--- a/roles/prometheus_federate/tasks/main.yml
+++ b/roles/prometheus_federate/tasks/main.yml
@@ -34,7 +34,8 @@
     enabled: true
     state: started
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages:
diff --git a/roles/re2o_service/tasks/main.yml b/roles/re2o_service/tasks/main.yml
index 882fdf9..2bed1a3 100644
--- a/roles/re2o_service/tasks/main.yml
+++ b/roles/re2o_service/tasks/main.yml
@@ -40,7 +40,8 @@
     group: nogroup
     state: link
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages:
diff --git a/roles/unifi_controller/tasks/main.yml b/roles/unifi_controller/tasks/main.yml
index b43c74b..811b5e1 100644
--- a/roles/unifi_controller/tasks/main.yml
+++ b/roles/unifi_controller/tasks/main.yml
@@ -40,7 +40,8 @@
   retries: 3
   until: apt_result is succeeded
 
-- include_role:
+- name: Configure MOTD
+  include_role:
     name: update_motd
   vars:
     motd_messages: