diff --git a/CHANGELOG.md b/CHANGELOG.md
index c159d47a..2486d311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ The **patch** part changes incrementally at each release.
 
 * add default (useless) value for file lookup (first_found)
 * fix pipefail option for shell invocations
+* evolinux-base: fix motd lookup path
 * ldap: fix edge cases where passwords were not set/get properly
 * listupgrade: fix wget error + shellcheck cleanup
 
diff --git a/evolinux-base/tasks/motd.yml b/evolinux-base/tasks/motd.yml
index 076a4226..9d5a109d 100644
--- a/evolinux-base/tasks/motd.yml
+++ b/evolinux-base/tasks/motd.yml
@@ -7,11 +7,11 @@
     owner: root
     group: root
     mode: "0644"
-  loop: "{{ query('first_found', templates, errors='ignore') }}"
+  loop: "{{ query('first_found', templates) }}"
   vars:
     templates:
-      - "motd/motd.{{ inventory_hostname }}.j2"
-      - "motd/motd.{{ host_group | default('all') }}.j2"
-      - "motd/motd.default.j2"
+      - "templates/motd/motd.{{ inventory_hostname }}.j2"
+      - "templates/motd/motd.{{ host_group | default('all') }}.j2"
+      - "templates/motd/motd.default.j2"
   tags:
     - motd