diff --git a/base.yml b/base.yml
index 38ec360..ed05dbd 100755
--- a/base.yml
+++ b/base.yml
@@ -5,6 +5,7 @@
   roles:
     - baseconfig
     - basesecurity
+    - update_motd
 
 # Plug LDAP on all servers
 - hosts: all,!unifi
diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index 0af0b40..b122f4d 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -29,10 +29,6 @@
   retries: 3
   until: apt_result is succeeded
 
-- name: Configure MOTD
-  include_role:
-    name: update_motd
-
 # Configure APT mirrors on Debian Stretch
 - name: Configure APT mirrors
   when: