diff --git a/roles/alpine/tasks/main.yml b/roles/alpine/tasks/main.yml
index 6cce486..b8f5b57 100644
--- a/roles/alpine/tasks/main.yml
+++ b/roles/alpine/tasks/main.yml
@@ -1,3 +1,8 @@
+- name: Configure MOTD
+  template:
+    dest: /etc/motd
+    src: motd.j2
+
 - name: Tell ifupdown to rename network interfaces
   copy:
     dest: /etc/network/if-pre-up.d/nameif
@@ -111,11 +116,6 @@
     src: unattended-upgrade.logrotate
     mode: 0644
 
-- name: Configure MOTD
-  template:
-    dest: /etc/motd
-    src: motd.j2
-
 - name: Set authorized SSH keys
   authorized_key:
     user: root
diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml
index f590964..abb9cbd 100644
--- a/roles/debian/tasks/main.yml
+++ b/roles/debian/tasks/main.yml
@@ -1,3 +1,8 @@
+- name: Configure MOTD
+  template:
+    dest: /etc/motd
+    src: motd.j2
+
 - name: Add rules to rename network interfaces
   template:
     dest: /etc/udev/rules.d/10-network.rules
@@ -5,8 +10,6 @@
     mode: 0644
   notify: reboot
 
-- meta: flush_handlers
-
 - name: Set hostname
   hostname:
     name: '{{ inventory_hostname }}'
diff --git a/roles/alpine/templates/motd.j2 b/templates/motd.j2
similarity index 100%
rename from roles/alpine/templates/motd.j2
rename to templates/motd.j2