diff --git a/monitoring.yml b/monitoring.yml
index 7918cef28b159e4ef3ad083f3fbff804291e533d..76481ade316a0a4b7d7ce1caecea4c20d770c613 100644
--- a/monitoring.yml
+++ b/monitoring.yml
@@ -13,10 +13,16 @@
 
     # Debian non-free mirror
     debian_mirror: http://mirror.adm.crans.org/debian
+
+    # Indicate service in motd
+    motd_role:
+      name: prometheus
+      path: /etc/prometheus/
   roles:
     - debian-non-free
     - prometheus
     - prometheus-alertmanager
+    - motd-role
 
 # Monitor all hosts
 - hosts: all
@@ -32,5 +38,11 @@
     ldap_user_tree: "cn=Utilisateurs,{{ ldap_base }}"
     ldap_grafana_bind_dn: "cn=grafana,ou=service-users,{{ ldap_base }}"
     ldap_grafana_passwd: "{{ vault_ldap_grafana_passwd }}"
+
+    # Indicate service in motd
+    motd_role:
+      name: grafana
+      path: /etc/grafana/
   roles:
     - grafana
+    - motd-role
diff --git a/network.yml b/network.yml
index cfa534953929745e21dbbfbc308e5bd4134dfb98..53d759a6dac30836f1b2428e831b88a546fffc94 100644
--- a/network.yml
+++ b/network.yml
@@ -4,8 +4,14 @@
   vars:
     # Debian mirror on adm
     debian_mirror: http://mirror.adm.crans.org/debian
+
+    # Indicate service in motd
+    motd_role:
+      name: wireguard
+      path: /etc/wireguard/
   roles:
     - wireguard
+    - motd-role
 
 # Deploy DNS server
 - hosts: odlyd.adm.crans.org
diff --git a/roles/motd-role/tasks/main.yml b/roles/motd-role/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8b2b96461b35a8cd906711d84d670e3637d1afd2
--- /dev/null
+++ b/roles/motd-role/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+- name: "Indicate {{ motd_role.name }} in motd"
+  template:
+    src: update-motd.d/05-service.j2
+    dest: "/etc/update-motd.d/05-{{ motd_role.name }}"
+    mode: 0755
diff --git a/roles/motd-role/templates/update-motd.d/05-service.j2 b/roles/motd-role/templates/update-motd.d/05-service.j2
new file mode 100755
index 0000000000000000000000000000000000000000..75d15625773e40ddc8a955ea72ffd7298379667a
--- /dev/null
+++ b/roles/motd-role/templates/update-motd.d/05-service.j2
@@ -0,0 +1,6 @@
+#!/bin/sh
+# {{ ansible_managed }}
+echo "✨ {{ motd_role.name|capitalize }} a été déployé sur cette machine."
+{% if motd_role.path is defined %}
+echo "   Voir {{ motd_role.path }}"
+{% endif %}
diff --git a/services_web.yml b/services_web.yml
index 25baf19aac74ba6118cbebc18bcf46370d636d51..4d18fecad75a9ee9763d9fc1e2350b4a21d69a76 100644
--- a/services_web.yml
+++ b/services_web.yml
@@ -7,5 +7,10 @@
 - hosts: voyager.adm.crans.org
   vars:
     service_version: 1.1.10
+
+    # Indicate service in motd
+    motd_role:
+      name: framadate
   roles:
     - framadate
+    - motd-role