diff --git a/ansible.cfg b/ansible.cfg
index c8a3365a7a30d613eea125c6acc77047ce6f3094..dfc046722898ea830bd18b0fa8c216b611084e9c 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -10,7 +10,7 @@ retry_files_enabled = False
 inventory = ./hosts
 
 # Custom header in templates
-ansible_managed = Ansible managed, see https://gitlab.crans.org/nounous/ansible
+# ansible_managed = Ansible managed, see https://gitlab.crans.org/nounous/ansible
 
 # Do not use cows (with cowsay)
 nocows = 1
diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8a6a9810fb520d90e928ca3ceddf3af26390a6e4
--- /dev/null
+++ b/group_vars/all/vars.yaml
@@ -0,0 +1,9 @@
+dirty: "{{lookup('pipe', 'git diff --quiet || echo dirty')}}"
+ansible_header: |
+    +++++++++++++++++++++++++++++++++++++++++++++++++++
+       Ansible managed, don't modify the file locally.
+       See https://gitlab.crans.org/nounous/ansible.
+       Run by: {{ ansible_env.SUDO_USER }}
+       Latest commit: {% if dirty %}({{dirty}}) {% endif %}{{ lookup('pipe', 'git rev-parse HEAD') }}
+       {% set _, rpath = template_path.split('roles/') %}Template: roles/{{ rpath }}
+    +++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/roles/ansible/templates/update-motd.d/05-service.j2 b/roles/ansible/templates/update-motd.d/05-service.j2
index 9deed1ff2a508028c865f326e2bbca808a8cdb0c..154199749222f5f9614769e00734008439abdeb5 100755
--- a/roles/ansible/templates/update-motd.d/05-service.j2
+++ b/roles/ansible/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > Ansible a été déployé sur cette machine. Voir /var/local/ansible/.
diff --git a/roles/bind-authoritative/templates/bind/named.conf.local b/roles/bind-authoritative/templates/bind/named.conf.local
index d1ef11fe270c66fac08a9a1ac3df23a9dc1f064f..e9995b0033aeef215edf8ea012a0b62d03851e6e 100644
--- a/roles/bind-authoritative/templates/bind/named.conf.local
+++ b/roles/bind-authoritative/templates/bind/named.conf.local
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 {% if not bind.master %}
 {% for zone in bind.zones %}
diff --git a/roles/common-tools/templates/tmpfiles.d/screen.conf.j2 b/roles/common-tools/templates/tmpfiles.d/screen.conf.j2
index 7e6ea9937be830b1d071b00e581fb2a16f7b8668..a85e4b02f76b3f8d82ad87bb3c986893d498c772 100644
--- a/roles/common-tools/templates/tmpfiles.d/screen.conf.j2
+++ b/roles/common-tools/templates/tmpfiles.d/screen.conf.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 d /var/run/screen 0755 root utmp
diff --git a/roles/debian-apt-sources/templates/apt/sources.list.j2 b/roles/debian-apt-sources/templates/apt/sources.list.j2
index 361a5d1d7cb0beddfe1c84539db66cdae409dab1..25bf63871c2ee6959746c4ffaa8ef01b53328e33 100644
--- a/roles/debian-apt-sources/templates/apt/sources.list.j2
+++ b/roles/debian-apt-sources/templates/apt/sources.list.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # Mises à jour de sécurité
 deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates {{ debian_components }}
diff --git a/roles/django-cas/templates/cron.d/cas.j2 b/roles/django-cas/templates/cron.d/cas.j2
index 61da256d2e027325da224c6d97478c29c9adf84e..ec29265e07c9e9f483e8681d2115b92995a74eb4 100644
--- a/roles/django-cas/templates/cron.d/cas.j2
+++ b/roles/django-cas/templates/cron.d/cas.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 0   0  * * * www-data /usr/local/django/cas/manage.py clearsessions
 */5 *  * * * www-data /usr/local/django/cas/manage.py cas_clean_tickets
 5   0  * * * www-data /usr/local/django/cas/manage.py cas_clean_sessions
diff --git a/roles/django-cas/templates/update-motd.d/05-service.j2 b/roles/django-cas/templates/update-motd.d/05-service.j2
index 7f155732b630fdc332798f21fa699dcc1c347008..7960a72bca9ec7ca7c3783fd47edb89f88090885 100755
--- a/roles/django-cas/templates/update-motd.d/05-service.j2
+++ b/roles/django-cas/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > django-cas-server a été déployé sur cette machine. Voir /usr/local/django/cas.
diff --git a/roles/framadate/templates/update-motd.d/05-service.j2 b/roles/framadate/templates/update-motd.d/05-service.j2
index 6308fc0df8d2220e90dc00e198613ff89d022453..5cf07002008bbd6cac3d4e1e6b24e2af60a889de 100755
--- a/roles/framadate/templates/update-motd.d/05-service.j2
+++ b/roles/framadate/templates/update-motd.d/05-service.j2
@@ -1,4 +1,4 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > framadate a été déployé sur cette machine.
   Voir {{ framadate_path }}
diff --git a/roles/ftpsync/templates/ftpsync-cron.j2 b/roles/ftpsync/templates/ftpsync-cron.j2
index 81f1a9aa50ba28498334e1bfe47889c58b6c169d..d4639dc064ae5c75dca8a7259a513a1d715d862f 100644
--- a/roles/ftpsync/templates/ftpsync-cron.j2
+++ b/roles/ftpsync/templates/ftpsync-cron.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {% for i in ftpsync %}
 {{ i.cron_time }}  * * *   mirror ftpsync sync:archive:{{ i.name }}
 {% endfor %}
diff --git a/roles/ftpsync/templates/ftpsync.conf.j2 b/roles/ftpsync/templates/ftpsync.conf.j2
index a4178b352f06842ca891457ef0a832b53cf972ac..f2045da5afbe1ff78a8bac4a93a69cacd561e088 100644
--- a/roles/ftpsync/templates/ftpsync.conf.j2
+++ b/roles/ftpsync/templates/ftpsync.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 MIRRORNAME="CRANS"
 TO="{{ item.dest }}"
diff --git a/roles/ftpsync/templates/update-motd.d/05-service.j2 b/roles/ftpsync/templates/update-motd.d/05-service.j2
index 7b05fcd20ee0b06c85cf8d3dbee0813332bc0941..be2b6cb5e81f4b177ef5d26582da2849b734c9b9 100755
--- a/roles/ftpsync/templates/update-motd.d/05-service.j2
+++ b/roles/ftpsync/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > ftpsync a été déployé sur cette machine. Voir /etc/ftpsync/.
diff --git a/roles/grafana/templates/ldap.toml.j2 b/roles/grafana/templates/ldap.toml.j2
index f1f6c0c6f69e238cb5bc576a8b5c3299bdf75b09..8fee24731f293a520478554430952b9f11ab53f6 100644
--- a/roles/grafana/templates/ldap.toml.j2
+++ b/roles/grafana/templates/ldap.toml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # To troubleshoot and get more log info enable ldap debug logging in grafana.ini
 # [log]
 # filters = ldap:debug
diff --git a/roles/grafana/templates/update-motd.d/05-service.j2 b/roles/grafana/templates/update-motd.d/05-service.j2
index 19a693af0e3d903eaec9cb0930c900d132bf0840..c85963d9ffeae7f04ae2b91a708321b19028b3bc 100755
--- a/roles/grafana/templates/update-motd.d/05-service.j2
+++ b/roles/grafana/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > grafana a été déployé sur cette machine. Voir /etc/grafana/.
diff --git a/roles/home-permanent/templates/systemd/system/home.mount.j2 b/roles/home-permanent/templates/systemd/system/home.mount.j2
index a5d29ce9d431d13322b362807b1162cc6c18779a..f5450959cb6f98453615db1bfaa5240bbf35d85d 100644
--- a/roles/home-permanent/templates/systemd/system/home.mount.j2
+++ b/roles/home-permanent/templates/systemd/system/home.mount.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=Mount home-adh on zbee
 Wants=network-online.target
diff --git a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 b/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
index 6b6fe6cc1505aa00cb3566d717ee1bd401262598..8be15508f963b474656ead4319279a681e9beaaa 100644
--- a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
+++ b/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
@@ -1,5 +1,5 @@
 # dhcpd.conf
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # option definitions common to all supported networks...
 #option domain-name "example.org";
diff --git a/roles/keepalived/templates/keepalived/keepalived.conf.j2 b/roles/keepalived/templates/keepalived/keepalived.conf.j2
index fc2e1578a42d0dd3e1a552d066ff361d8d31fa26..219d6b4fd66c34da5e372429f02e43488da1c5fe 100644
--- a/roles/keepalived/templates/keepalived/keepalived.conf.j2
+++ b/roles/keepalived/templates/keepalived/keepalived.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 global_defs {
   notification_email {
diff --git a/roles/ldap-client/templates/bin/passwd.j2 b/roles/ldap-client/templates/bin/passwd.j2
index d7ce14d7e4f7f491b1313eefdc4a99e4c1b38f0e..40b0412654d794d64ac14ae982d4ae3068c5ec07 100644
--- a/roles/ldap-client/templates/bin/passwd.j2
+++ b/roles/ldap-client/templates/bin/passwd.j2
@@ -1,3 +1,3 @@
 #!/bin/sh
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 echo "Pour changer votre mot de passe,\nAllez sur l'intranet : {{intranet_url}}"
diff --git a/roles/ldap-client/templates/nslcd.conf.j2 b/roles/ldap-client/templates/nslcd.conf.j2
index 594a63840e594a9a85e1613348fe5a2f1bc4540d..e634dd23cbe1559df15a524f04001abfe5b348ad 100644
--- a/roles/ldap-client/templates/nslcd.conf.j2
+++ b/roles/ldap-client/templates/nslcd.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # The user and group nslcd should run as.
 uid nslcd
diff --git a/roles/local-facts/templates/facts.d/hash.fact.j2 b/roles/local-facts/templates/facts.d/hash.fact.j2
index ee5df3250e866b7aceaf4d49216e4b43024ca865..5c221c08e0442f5c0199687cf4ed0a5867667611 100755
--- a/roles/local-facts/templates/facts.d/hash.fact.j2
+++ b/roles/local-facts/templates/facts.d/hash.fact.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 [commit]
 latest_commit_hash: {{ git_version.stdout }}
diff --git a/roles/logall/templates/logrotate.d/firewall.j2 b/roles/logall/templates/logrotate.d/firewall.j2
index 550e85abe39c8e4878a99d8b7da2522c3215e985..0867811813db31fdd3db43358e05d2b2ef53f7db 100644
--- a/roles/logall/templates/logrotate.d/firewall.j2
+++ b/roles/logall/templates/logrotate.d/firewall.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 /var/log/firewall/trace.log
 /var/log/firewall/filtre.log
diff --git a/roles/logall/templates/rsyslog.d/10-firewall.conf.j2 b/roles/logall/templates/rsyslog.d/10-firewall.conf.j2
index 94e23c4d7e71c3e28b083df89ba96c4e05fbafc6..6faa5180723c7f13c6671d332bb6fde87fdc12da 100644
--- a/roles/logall/templates/rsyslog.d/10-firewall.conf.j2
+++ b/roles/logall/templates/rsyslog.d/10-firewall.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #$ModLoad imklog #Déjà présent dans rsyslog.conf
 
 # Messages du firewall (ie de sa génération)
diff --git a/roles/mtail/templates/default/mtail.j2 b/roles/mtail/templates/default/mtail.j2
index bb782a3f7476d687b341aa86af1e5152e0c9bdb4..94bbac1aa55b8b6b725a832152c37ddd3515d54f 100644
--- a/roles/mtail/templates/default/mtail.j2
+++ b/roles/mtail/templates/default/mtail.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Set to 1 to start Mtail at boot.
 ENABLED=1
 
diff --git a/roles/mtail/templates/mtail/dhcpd.mtail.j2 b/roles/mtail/templates/mtail/dhcpd.mtail.j2
index c612a4047c8a688cc452cd7b2c449e1ad83e5589..b3f8629b564458e79f00a6d28799fee6da0cd198 100644
--- a/roles/mtail/templates/mtail/dhcpd.mtail.j2
+++ b/roles/mtail/templates/mtail/dhcpd.mtail.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Copyright 2011 Google Inc. All Rights Reserved.
 # This file is available under the Apache license.
 
diff --git a/roles/mtail/templates/update-motd.d/05-service.j2 b/roles/mtail/templates/update-motd.d/05-service.j2
index 74dc66f5be6f0d25250f9f0e50b9789a62ad0098..8e63351fbd381ae5e803cbd50c255caa8aa1bf25 100755
--- a/roles/mtail/templates/update-motd.d/05-service.j2
+++ b/roles/mtail/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > mtail a été déployé sur cette machine. Voir /etc/mtail/.
diff --git a/roles/mumudvb/templates/default/mumudvb.j2 b/roles/mumudvb/templates/default/mumudvb.j2
index 3638e0d36c2436e3c6de46f91dd3902d1b175e95..4df46abeb67b39c5d53ceb0a31594744ed6e056f 100644
--- a/roles/mumudvb/templates/default/mumudvb.j2
+++ b/roles/mumudvb/templates/default/mumudvb.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #Mumudvb init config file
 #
 # This file is used to specify the locations of mumudvb config files for each card
diff --git a/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2 b/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2
index ec7f3673d8eb49c2c205ccebf524af101007e636..037f5e2afe8b20e05960c8e48d7d880ce7937d5a 100644
--- a/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2
+++ b/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 /home /etc/auto.master.d/home-adh.sh -t600
diff --git a/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2 b/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2
index 1757c7d93dcbf5ef83431c62a92e543279ff7547..ea85a234535b1f793707570c60c6882dc595c92e 100755
--- a/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2
+++ b/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2
@@ -1,3 +1,3 @@
 #!/bin/sh
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 exec echo "-fstype=nfs,nosuid nfs.adm.crans.org:/home-adh/$1"
diff --git a/roles/nfs-autofs/templates/auto.master.j2 b/roles/nfs-autofs/templates/auto.master.j2
index 4ff2d9dd64d9fdae802c147fc2e5a89270e74250..1502faeb2a9b89d241c8e31b4c109efa4a4dbe4b 100644
--- a/roles/nfs-autofs/templates/auto.master.j2
+++ b/roles/nfs-autofs/templates/auto.master.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # Sample auto.master file
 # This is a 'master' automounter map and it has the following format:
diff --git a/roles/nfs-autofs/templates/default/autofs.j2 b/roles/nfs-autofs/templates/default/autofs.j2
index 4c28d40400184d284138d7eecf2c21b7ead55ff7..dda3c1fed1a649e38d4f26596f454608d2f730e2 100644
--- a/roles/nfs-autofs/templates/default/autofs.j2
+++ b/roles/nfs-autofs/templates/default/autofs.j2
@@ -1,6 +1,6 @@
 #
 # Init system options
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # If the kernel supports using the autofs miscellanous device
 # and you wish to use it you must set this configuration option
diff --git a/roles/nfs-common/templates/nfs-common.j2 b/roles/nfs-common/templates/nfs-common.j2
index 84b23a6805ca50d178ba49f3ff4bf9e7bfea05aa..ef51d4e7531965379337378fa0c4bca88ae576dd 100644
--- a/roles/nfs-common/templates/nfs-common.j2
+++ b/roles/nfs-common/templates/nfs-common.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # If you do not set values for the NEED_ options, they will be attempted
 # autodetected; this should be sufficient for most people. Valid alternatives
 # for the NEED_ options are "yes" and "no".
diff --git a/roles/nginx-pubftp/templates/nginx/ftp.j2 b/roles/nginx-pubftp/templates/nginx/ftp.j2
index 8e2e9839ce472b086c97847b9bd6c40e306d1415..7ebf0cf27a9c49798f103e121bb6146354f80078 100644
--- a/roles/nginx-pubftp/templates/nginx/ftp.j2
+++ b/roles/nginx-pubftp/templates/nginx/ftp.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 server { 
     listen 80;
     listen [::]:80;
diff --git a/roles/nginx-pubftp/templates/update-motd.d/05-service.j2 b/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
index 030f6f0760f37051037d8c7ee2ee9f07cf45e3b7..8f299dfa9b40809089f649f7e93680af2d118b97 100755
--- a/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
+++ b/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > NGINX a été déployé sur cette machine. Voir /etc/nginx/.
diff --git a/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2 b/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2
index 363b7f26ed29b56f703a5b4e868363c047c637c3..3fbf9b82e2ea62d947693160aca6bd2877292b74 100644
--- a/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2
+++ b/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=NinjaBot WebHook server
 After=network.target ninjabot.service
diff --git a/roles/ninjabot/templates/systemd/system/ninjabot.service.j2 b/roles/ninjabot/templates/systemd/system/ninjabot.service.j2
index e21cd1cc07825cc1f6cda76ee8b8c0dd3607578c..4a9886ca9672c09cb584d87b2b9596e1c7c86475 100644
--- a/roles/ninjabot/templates/systemd/system/ninjabot.service.j2
+++ b/roles/ninjabot/templates/systemd/system/ninjabot.service.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=NinjaBot IRC bot
 After=network.target
diff --git a/roles/ninjabot/templates/update-motd.d/05-service.j2 b/roles/ninjabot/templates/update-motd.d/05-service.j2
index 0537f6a7ca26c68a84edb2739bc560a0b8ed64fa..8dec761c1fe3063300cabf7ea974da4d49f6b73a 100755
--- a/roles/ninjabot/templates/update-motd.d/05-service.j2
+++ b/roles/ninjabot/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > NinjaBot a été déployé sur cette machine. Voir /var/local/ninjabot/.
diff --git a/roles/ntp-client/templates/ntp.conf.j2 b/roles/ntp-client/templates/ntp.conf.j2
index b65a209c2f0ff7bd761ba482dfbcb791c1908383..050f51c895bcd64b6425bcad74cb60736960df73 100644
--- a/roles/ntp-client/templates/ntp.conf.j2
+++ b/roles/ntp-client/templates/ntp.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
 
 driftfile /var/lib/ntp/ntp.drift
diff --git a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2 b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2
index 62c3cb15df08b62774dc64c3bb393f6b7e41176b..88def7c138caeee7785edd4f3fca7bca01d79505 100644
--- a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2
+++ b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 /home-owncloud /etc/auto.master.d/home-owncloud.sh -t60
diff --git a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2 b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
index eded801c231aea1c7c0692086751f8f7e78c1880..7a3ec28f98af854f582979fd769868569c371e4a 100755
--- a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
+++ b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
@@ -1,5 +1,5 @@
 #!/bin/bash
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # Certains user dans owncloud ont été créés sous la forme user_1234 ce qui faisait planter le autofs
 # ceci est un fix
diff --git a/roles/owncloud-autofs/templates/auto.master.j2 b/roles/owncloud-autofs/templates/auto.master.j2
index 4ff2d9dd64d9fdae802c147fc2e5a89270e74250..1502faeb2a9b89d241c8e31b4c109efa4a4dbe4b 100644
--- a/roles/owncloud-autofs/templates/auto.master.j2
+++ b/roles/owncloud-autofs/templates/auto.master.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # Sample auto.master file
 # This is a 'master' automounter map and it has the following format:
diff --git a/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2 b/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2
index a525ac32551896242771150c28f2c78b27911fe7..3d540c59381363795aadeae125c6422df877354c 100644
--- a/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2
+++ b/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */15 * * * * root /bin/ls -l /home-owncloud/ 2>/dev/null | /bin/grep d????????? | /usr/bin/awk '{print $7}' | /usr/bin/xargs -I '@LOGIN@' /bin/umount /home-owncloud/@LOGIN@
diff --git a/roles/owncloud-autofs/templates/default/autofs.j2 b/roles/owncloud-autofs/templates/default/autofs.j2
index 4c28d40400184d284138d7eecf2c21b7ead55ff7..dda3c1fed1a649e38d4f26596f454608d2f730e2 100644
--- a/roles/owncloud-autofs/templates/default/autofs.j2
+++ b/roles/owncloud-autofs/templates/default/autofs.j2
@@ -1,6 +1,6 @@
 #
 # Init system options
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # If the kernel supports using the autofs miscellanous device
 # and you wish to use it you must set this configuration option
diff --git a/roles/owncloud/templates/cron.d/owncloud.j2 b/roles/owncloud/templates/cron.d/owncloud.j2
index 5838070e6348a0cf7682b94c1b52cb705d1cf019..f3d6acd73d8cbfe9873e395ed1ee3b06a22b70c7 100644
--- a/roles/owncloud/templates/cron.d/owncloud.j2
+++ b/roles/owncloud/templates/cron.d/owncloud.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */15 * * * * www-data /usr/bin/php /var/www/owncloud/occ system:cron > /dev/null 2>&1
diff --git a/roles/owncloud/templates/nginx/owncloud.j2 b/roles/owncloud/templates/nginx/owncloud.j2
index cb19043daa1dfc38db30c8065afb8f47860c6f7b..79352bbf3ce262b88d9852209718f497da383bcb 100644
--- a/roles/owncloud/templates/nginx/owncloud.j2
+++ b/roles/owncloud/templates/nginx/owncloud.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 upstream php-handler {
     server unix:/var/run/php/php7.3-fpm.sock;
diff --git a/roles/owncloud/templates/update-motd.d/05-service.j2 b/roles/owncloud/templates/update-motd.d/05-service.j2
index e404360211953a7a3a0dbf0c7a7836b2decd0e05..b46d3876441dbc0c50708aa60c87029339b82a67 100755
--- a/roles/owncloud/templates/update-motd.d/05-service.j2
+++ b/roles/owncloud/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > OwnCloud a été déployé sur cette machine. Voir /var/www/owncloud/.
diff --git a/roles/postfix/templates/postfix/canonical.j2 b/roles/postfix/templates/postfix/canonical.j2
index c0cfd0826b598dc2437a4d6ebaa132311172eca5..f852a13bab805da02b2ffa0b5f68b084514e75f1 100644
--- a/roles/postfix/templates/postfix/canonical.j2
+++ b/roles/postfix/templates/postfix/canonical.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Fichier fournissant des méthodes pour traduire certaines adresses
 
 /^(.*)@localhost(\.crans\.org)?$/   ${1}@crans.org
diff --git a/roles/postfix/templates/postfix/main.cf.j2 b/roles/postfix/templates/postfix/main.cf.j2
index d4b299c4a94e3692b4a63fa907fd88d89a18a91f..239ccb5a10a06241981273a4fffdf218c75188fd 100644
--- a/roles/postfix/templates/postfix/main.cf.j2
+++ b/roles/postfix/templates/postfix/main.cf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Fichier de configuration principal de postfix.
 
 # +------------------+
diff --git a/roles/postfix/templates/postfix/master.cf.j2 b/roles/postfix/templates/postfix/master.cf.j2
index f979e4fa8dbf5b0ae842a162bfa868ee50f6e727..40a696c440b61e4a3a3b8fe1e5d5e481cfaa6fcb 100644
--- a/roles/postfix/templates/postfix/master.cf.j2
+++ b/roles/postfix/templates/postfix/master.cf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_header }}
 # Fichier de configuration des démons de postfix.
 
 # +------------------------+
diff --git a/roles/postfix/templates/postfix/mime_header_checks.j2 b/roles/postfix/templates/postfix/mime_header_checks.j2
index c5e4719313d444d2f57ee3114d307fc29fd8c0e9..2195544e05974f9d92a0f01aa3e83560efa723c3 100644
--- a/roles/postfix/templates/postfix/mime_header_checks.j2
+++ b/roles/postfix/templates/postfix/mime_header_checks.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Filtrage des fichiers envoyes en piece jointe.
 
 # La version hard (s'il n'y a pas d'antivirus, ou pour le dernier virus a la mode)
diff --git a/roles/postfix/templates/postfix/postscreen_access.cidr.j2 b/roles/postfix/templates/postfix/postscreen_access.cidr.j2
index 65a8c8c3efe9295578e50a02b20a496c84d58e2c..fb8869f5256f290d544296deb7324a8006ab4464 100644
--- a/roles/postfix/templates/postfix/postscreen_access.cidr.j2
+++ b/roles/postfix/templates/postfix/postscreen_access.cidr.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 127.0.0.1                                 permit
 138.231.0.0/16                            permit
diff --git a/roles/postfix/templates/postfix/transport.j2 b/roles/postfix/templates/postfix/transport.j2
index 2e44b92ad32bcdd7bcc3db3c07423447497b8f37..77e92b2bfd998de8d1648bf06623536b512c57b3 100644
--- a/roles/postfix/templates/postfix/transport.j2
+++ b/roles/postfix/templates/postfix/transport.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Transport des mails
 
 {% if postfix.mailman %}
diff --git a/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2 b/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2
index bf4d26e0739be5a46b8e23a5e5079239e4fc5f98..28c27f277240f49d06bff60bea64eef8d262cbe9 100644
--- a/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2
+++ b/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # See https://prometheus.io/docs/alerting/configuration/ for documentation.
 
 global:
diff --git a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2 b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
index 74f429c0abfe24d5ad134cdbb11ce19379f6f492..8748744f65062b0d2784bec20897e23467e60338 100644
--- a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
+++ b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # TODOlist :
 # - Faire fonctionner le monitoring des switchs défini ici
 #   * Configurer tous les switchs avec un compte SNMPv3
diff --git a/roles/prometheus/templates/prometheus/alert.rules.yml.j2 b/roles/prometheus/templates/prometheus/alert.rules.yml.j2
index 32064d32f1268d7e6db96624328361e8baa5e411..4443b36479426a6ff9279cd3bd08ac9819a8548f 100644
--- a/roles/prometheus/templates/prometheus/alert.rules.yml.j2
+++ b/roles/prometheus/templates/prometheus/alert.rules.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {# As this is also Jinja2 it will conflict without a raw block #}
 {# Depending of Prometheus Node exporter version, rules can change depending of version #}
 {% raw %}
diff --git a/roles/prometheus/templates/prometheus/django.rules.yml.j2 b/roles/prometheus/templates/prometheus/django.rules.yml.j2
index fddd3985f49acfb097cd80d9c15f2de878fe7807..8131a71fe38acd773defa3c0d1fc449773c8db29 100644
--- a/roles/prometheus/templates/prometheus/django.rules.yml.j2
+++ b/roles/prometheus/templates/prometheus/django.rules.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {# As this is also Jinja2 it will conflict without a raw block #}
 {% raw %}
 groups:
diff --git a/roles/prometheus/templates/prometheus/prometheus.yml.j2 b/roles/prometheus/templates/prometheus/prometheus.yml.j2
index 8dc04497af5ac93c326359d6afb1fafe56cffba7..4d1840808b0d2c79dcec7cc2f482fe6932b3b87a 100644
--- a/roles/prometheus/templates/prometheus/prometheus.yml.j2
+++ b/roles/prometheus/templates/prometheus/prometheus.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 global:
   # scrape_interval is set to the global default (60s)
diff --git a/roles/prometheus/templates/update-motd.d/05-service.j2 b/roles/prometheus/templates/update-motd.d/05-service.j2
index af9dab742855bc038fae09423bb57c70f69bf830..716000655348fbd3252771c55940efa4b51497f8 100755
--- a/roles/prometheus/templates/update-motd.d/05-service.j2
+++ b/roles/prometheus/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > prometheus a été déployé sur cette machine. Voir /etc/prometheus/.
diff --git a/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2 b/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2
index 8ffb21983eb0ccc23dfae3f77dae40caccd14977..f3829097ce45b35d5a7eb839d22d9c4c1dbafa76 100644
--- a/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2
+++ b/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 router bgp {{ bgp.as }}
 no synchronization
diff --git a/roles/quagga-ipv4/templates/quagga/zebra.conf.j2 b/roles/quagga-ipv4/templates/quagga/zebra.conf.j2
index 3c7672122a6bf3e29bdec2ef36096cbb1ce428d0..4f3b6367b744aabcacd23d5faaca37497a7793d3 100644
--- a/roles/quagga-ipv4/templates/quagga/zebra.conf.j2
+++ b/roles/quagga-ipv4/templates/quagga/zebra.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 hostname zebra
 password {{ zebra.password }}
diff --git a/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2 b/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2
index 3c472a858e2d5af18a199dc6eff018374e3b250b..2fe4a763a5b097ae97ebcac8e1fb959550afa26a 100644
--- a/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2
+++ b/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 router bgp {{ bgp.as }}
 no synchronization
diff --git a/roles/quagga-ipv6/templates/quagga/zebra.conf.j2 b/roles/quagga-ipv6/templates/quagga/zebra.conf.j2
index b4fe39e52cb583f785bd74737d1cdd6f8209c13b..aa63898a1fae4511bbe2e8f1b36142298068b6ad 100644
--- a/roles/quagga-ipv6/templates/quagga/zebra.conf.j2
+++ b/roles/quagga-ipv6/templates/quagga/zebra.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 hostname zebra
 password {{ zebra.password }}
diff --git a/roles/quagga/templates/quagga/daemons.j2 b/roles/quagga/templates/quagga/daemons.j2
index 721ccc9e1a62e14306ef2532cd8dd0cddcd3173d..2bc2888351ce8fc004823991d711a3632fe16f96 100644
--- a/roles/quagga/templates/quagga/daemons.j2
+++ b/roles/quagga/templates/quagga/daemons.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 #   2 .. 10  = lower priorities
 # Read /usr/share/doc/quagga/README.Debian for details.
diff --git a/roles/quagga/templates/quagga/debian.conf.j2 b/roles/quagga/templates/quagga/debian.conf.j2
index 8f1f13fb797b67aaf18db506318a2f031352ad21..ac5f1703f47aa7941836b890c9b30c48195549d7 100644
--- a/roles/quagga/templates/quagga/debian.conf.j2
+++ b/roles/quagga/templates/quagga/debian.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_header }}
 #
 # If this option is set the /etc/init.d/quagga script automatically loads
 # the config via "vtysh -b" when the servers are started.
diff --git a/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2 b/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2
index fa341ae2b6ba8cbae5aadb0511dfcb727979d8f2..7632df1b26b47eabaf01de17741bb7a84bb368c0 100644
--- a/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2
+++ b/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 * * * * * root /usr/bin/python3 /var/local/re2o-services/dhcp/main.py
diff --git a/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2 b/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2
index 56324c224b5fd6a3eb30ea6d0fe0ef04af9326a4..ce93d9436677c8bf9bde8c1e015aa938326a5721 100644
--- a/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2
+++ b/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */2 * * * * root /usr/bin/python3 /var/local/re2o-services/dns/main.py
diff --git a/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2
index 9b0bf47880fc6465a15b65b3172e538631175c86..7c8cd0dbf0e2ffc88c5e785be21b9b00efcb4dee 100644
--- a/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2
index eddcf5742db3a661d9ef869d763c96ec2d8177fd..bba22b626df08b003e6185a98656aff610fa0edc 100644
--- a/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2
index 133b9ac6ae3fb183d59dd032ef457c0c98a37389..3cf5f8a386c545b82c33f3e908fc4ce795b34b3a 100644
--- a/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2
index 1b60c1cb4589538b5e66edbb9b157ccdd7737c91..12dca11ab7cdc4c1814667028986ea7db5a2baea 100644
--- a/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2
index 9cd2b9edbe74035cf5cb7ef3448d8df88b3b7f2e..17b601b3a16bd4f5ae6d6b53fb6b5f5cd3bf02d9 100644
--- a/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2 b/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2
index 2565d92e6eac4df4f31cf5437caddcd711274b79..e81d47757d5bca8d6cc7d4606d6a6ea63a68377f 100644
--- a/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2
+++ b/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */2 * * * * root /usr/bin/python3 /var/local/re2o-services/firewall/main.py
 @reboot root /usr/bin/python3 /var/local/re2o-services/firewall/main.py --force
diff --git a/roles/re2o-home/templates/cron.d/re2o-services-home.j2 b/roles/re2o-home/templates/cron.d/re2o-services-home.j2
index a40a7669f2b9a613a504138691442b94ab031104..ff3c262f9af33ecfa0905b1f21c05aab7109707f 100644
--- a/roles/re2o-home/templates/cron.d/re2o-services-home.j2
+++ b/roles/re2o-home/templates/cron.d/re2o-services-home.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */2 * * * * root /usr/bin/python3 /var/local/re2o-services/home/main.py
diff --git a/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2 b/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2
index c804b50af4971225bc3b5724d554eab9a1bf6981..579f720d96bb92aed424539a0de763cc84b73468 100644
--- a/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2
+++ b/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */5 * * * * root /usr/bin/python3 /var/local/re2o-services/mail-server/main.py
diff --git a/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2 b/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2
index 92aaf0a7214f62923990b15fabac01c972bf4359..d82241ea9ef071bdf52b68a26e490cbf2861ffe0 100644
--- a/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2
+++ b/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 @hourly root /usr/bin/python3 /var/local/re2o-services/notif-users/main.py
diff --git a/roles/re2o-services/templates/re2o-services/config.ini.j2 b/roles/re2o-services/templates/re2o-services/config.ini.j2
index 9ff151ca8c135a8948e404107fcd7747839314b0..8e464dfc0e347f0acc27bd3b020973003af2cbff 100644
--- a/roles/re2o-services/templates/re2o-services/config.ini.j2
+++ b/roles/re2o-services/templates/re2o-services/config.ini.j2
@@ -1,4 +1,4 @@
-; {{ ansible_managed }}
+; {{ ansible_header | comment }}
 [Re2o]
 hostname = {{ re2o.server }}
 username = {{ re2o.service_user }}
diff --git a/roles/re2o/templates/re2o/settings_local.py.j2 b/roles/re2o/templates/re2o/settings_local.py.j2
index 50857c86feefc8e90b201ae22cd11c7b30f4de1a..a11c957f36a1caa3e0be53ea66fda1463ebf2335 100644
--- a/roles/re2o/templates/re2o/settings_local.py.j2
+++ b/roles/re2o/templates/re2o/settings_local.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 from __future__ import unicode_literals
 
diff --git a/roles/re2o/templates/update-motd.d/05-service.j2 b/roles/re2o/templates/update-motd.d/05-service.j2
index 3d29ee95e8e166a2617fa46cf7ad2050f084708d..a3646eaf9538425ee1ec1945abe601688e8030cf 100755
--- a/roles/re2o/templates/update-motd.d/05-service.j2
+++ b/roles/re2o/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > Re2o a été déployé sur cette machine. Voir /var/www/re2o/.
diff --git a/roles/rsync-client/templates/rsyncd.conf.j2 b/roles/rsync-client/templates/rsyncd.conf.j2
index eab22931dac128f0ba0cb3cee3524ce108da6f12..d1236f0757426c3894f58bf0a0dfa1cd0239911c 100644
--- a/roles/rsync-client/templates/rsyncd.conf.j2
+++ b/roles/rsync-client/templates/rsyncd.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # GLOBAL OPTIONS
 log file=/var/log/rsyncd
diff --git a/roles/rsync-mirror/templates/rsync-mirror-cron.j2 b/roles/rsync-mirror/templates/rsync-mirror-cron.j2
index 039b64224a71c765b1e9bf584f3c3578c1e6f6ed..cb98968f54094093122a3f259cf7fe5ac4d38bad 100644
--- a/roles/rsync-mirror/templates/rsync-mirror-cron.j2
+++ b/roles/rsync-mirror/templates/rsync-mirror-cron.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {% for i in rsync_mirror %}
 {{ i.cron_time }}  * * *   mirror rsync --times --links --hard-links --partial --block-size=8192 --recursive --exclude *-dvd-* --exclude source/ --verbose --stats --delete-after rsync://{{ i.rsync_host }}/{{ i.rsync_path }} {{ i.dest }} | tee -a "/var/log/mirror/{{ i.name }}.log" > /dev/null
 {% endfor %}
diff --git a/roles/rsync-mirror/templates/update-motd.d/05-service.j2 b/roles/rsync-mirror/templates/update-motd.d/05-service.j2
index 0f9abd08eac89cb8479d882c26016ec14ab1e014..1b32b9ec532379997209a0bcf5cd91511d3a5f0d 100755
--- a/roles/rsync-mirror/templates/update-motd.d/05-service.j2
+++ b/roles/rsync-mirror/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > rsync-mirror a été déployé sur cette machine. Voir /etc/cron.d/rsync-mirror.
diff --git a/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2 b/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2
index 3eedde5ebb3efe1cce47daee69a3102481cf4eba..6a1bc009258e3a2398ddfee35feb97a708cd5d4e 100644
--- a/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2
+++ b/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 $ModLoad omrelp
 $WorkDirectory /var/log/spool  # default location for work (spool) files
 
diff --git a/roles/sudo/templates/sudoers.d/custom_passprompt.j2 b/roles/sudo/templates/sudoers.d/custom_passprompt.j2
index 27e69564023af8ff9fd54f7562ffcfb46cf3f14b..add19a4ed03099180f057ff9c9f0041bf1f96743 100644
--- a/roles/sudo/templates/sudoers.d/custom_passprompt.j2
+++ b/roles/sudo/templates/sudoers.d/custom_passprompt.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Change prompt
 Defaults        passprompt_override
 Defaults        passprompt="[sudo] mot de passe pour %p sur %h: "
diff --git a/roles/sudo/templates/sudoers.d/group_privilege.j2 b/roles/sudo/templates/sudoers.d/group_privilege.j2
index 0239609bc6981ff21aa149efd75bd794f49f88ad..54f198cd92cf1f17ba9799d9fbcbbf37f277460e 100644
--- a/roles/sudo/templates/sudoers.d/group_privilege.j2
+++ b/roles/sudo/templates/sudoers.d/group_privilege.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Group privilege specification
 %nounou    ALL=(ALL:ALL) ALL
diff --git a/roles/sudo/templates/sudoers.j2 b/roles/sudo/templates/sudoers.j2
index 9ad07f35fc4a55b9e741998b844deabef1228481..dbc086bab81a19ab19b889a60e36b9969348d529 100644
--- a/roles/sudo/templates/sudoers.j2
+++ b/roles/sudo/templates/sudoers.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # See the man page for details on how to write a sudoers file.
 #
diff --git a/roles/unifi-controller/templates/update-motd.d/05-service.j2 b/roles/unifi-controller/templates/update-motd.d/05-service.j2
index e3d89df27e35939834527f2c49e16fd94f7cdc59..59ce4a0e933e1f6c60cc44359a947b29e9476128 100755
--- a/roles/unifi-controller/templates/update-motd.d/05-service.j2
+++ b/roles/unifi-controller/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > Le contrôleur Unifi a été déployé sur cette machine.
diff --git a/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2 b/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2
index 5de43d804c593981387bcde971dcd3d1a94f5ece..4ffc0b66ca37dbe71499ec645369d4019a27c8a0 100644
--- a/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2
+++ b/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 Package: *
 Pin: release a=unstable
diff --git a/roles/wireguard/templates/update-motd.d/05-service.j2 b/roles/wireguard/templates/update-motd.d/05-service.j2
index e0ab595f4cc4ba6862fcc94d5e5eb9c9dee04284..b59ca12e4798504b95f2b2c204262a65c29a6ed7 100755
--- a/roles/wireguard/templates/update-motd.d/05-service.j2
+++ b/roles/wireguard/templates/update-motd.d/05-service.j2
@@ -1,4 +1,4 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > wireguard a été déployé sur cette machine.
   Voir /etc/wireguard/
diff --git a/roles/wireguard/templates/wireguard/sputnik.conf.j2 b/roles/wireguard/templates/wireguard/sputnik.conf.j2
index 2d657b47889769d48810df84605bd19f273467c0..71f4a1a3aa611f1b33dba8829d3807719808e436 100644
--- a/roles/wireguard/templates/wireguard/sputnik.conf.j2
+++ b/roles/wireguard/templates/wireguard/sputnik.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {% if wireguard.sputnik %}
 [Interface]
 Address = 172.31.0.2/30, fd0c:700:0:8::2/64
diff --git a/roles/zbee-mount/templates/systemd/system/home.mount.j2 b/roles/zbee-mount/templates/systemd/system/home.mount.j2
index 65a1a795eb655422977331ada7ee9da2341b3c5f..2727294627fa9aa4497bdc924d9ec028ef13c60f 100644
--- a/roles/zbee-mount/templates/systemd/system/home.mount.j2
+++ b/roles/zbee-mount/templates/systemd/system/home.mount.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=Mount /home-adh/{{ item }}
 After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service