diff --git a/templates/etc/default/xymon-client.j2 b/templates/etc/default/xymon-client.j2
index f2c7bec..5f8d3d5 100644
--- a/templates/etc/default/xymon-client.j2
+++ b/templates/etc/default/xymon-client.j2
@@ -1,3 +1,6 @@
+# {{ ansible_managed }}
+## From ipr-cnrs.xymon role
+
 # Configure the Xymon client settings.
 
 # You MUST set the list of Xymon servers that this
diff --git a/templates/etc/xymon/apt_no_repo_accept.j2 b/templates/etc/xymon/apt_no_repo_accept.j2
index 6386dee..1680ca9 100644
--- a/templates/etc/xymon/apt_no_repo_accept.j2
+++ b/templates/etc/xymon/apt_no_repo_accept.j2
@@ -1,4 +1,5 @@
 # {{ ansible_managed }}
+## From ipr-cnrs.xymon role
 {% for package in xymon_plug_apt_combined_whitelist %}
 {{ package }}
 {% endfor %}
diff --git a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2 b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
index 51cc673..8617fd7 100644
--- a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
@@ -1,4 +1,6 @@
 [apt]
+	# {{ ansible_managed }}
+	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_plug_apt_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
 	CMD $XYMONCLIENTHOME/ext/apt
diff --git a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2 b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
index 4a62766..b512313 100644
--- a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
@@ -1,4 +1,6 @@
 [ipmi]
+	# {{ ansible_managed }}
+	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ipmi_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
 	CMD /usr/bin/sudo -E -u root $XYMONCLIENTHOME/ext/ipmi
diff --git a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2 b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
index 64e5b60..1acb907 100644
--- a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
@@ -1,4 +1,6 @@
 [libs]
+	# {{ ansible_managed }}
+	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_plug_libs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
 	CMD $XYMONCLIENTHOME/ext/libs
diff --git a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2 b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
index 94e84d1..833930d 100644
--- a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
@@ -1,4 +1,6 @@
 [mq]
+	# {{ ansible_managed }}
+	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_plug_mq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
 	CMD $XYMONCLIENTHOME/ext/mq
diff --git a/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2 b/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
index c14c3ae..e6e1e8a 100644
--- a/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
@@ -1,4 +1,6 @@
 [netstats]
+	# {{ ansible_managed }}
+	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_netstats_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
 	CMD $XYMONCLIENTHOME/ext/netstats
diff --git a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2 b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
index a95008a..91f0349 100644
--- a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
@@ -1,4 +1,6 @@
 [zfs]
+	# {{ ansible_managed }}
+	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_zfs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
 	CMD /usr/bin/sudo -E -u root $XYMONCLIENTHOME/ext/zfs
diff --git a/templates/etc/xymon/libs.local.yaml.j2 b/templates/etc/xymon/libs.local.yaml.j2
index 8139529..e7df067 100644
--- a/templates/etc/xymon/libs.local.yaml.j2
+++ b/templates/etc/xymon/libs.local.yaml.j2
@@ -1,4 +1,5 @@
 # {{ ansible_managed }}
+## From ipr-cnrs.xymon role
 {% set inputmerged = xymon_plug_libs_default_whitelist.copy() %}
 {% set _ = inputmerged.update(xymon_plug_libs_whitelist) %}
 {% set _ = inputmerged.update(xymon_plug_libs_group_whitelist) %}
diff --git a/templates/usr/lib/xymon/client/ext/zfs.j2 b/templates/usr/lib/xymon/client/ext/zfs.j2
index 308fc28..9bc2624 100755
--- a/templates/usr/lib/xymon/client/ext/zfs.j2
+++ b/templates/usr/lib/xymon/client/ext/zfs.j2
@@ -1,4 +1,8 @@
 #!/bin/ksh
+
+# {{ ansible_managed }}
+# From ipr-cnrs.xymon role
+
 # Revision History:
 # 1. Mike Rowell <Mike.Rowell@Rightmove.co.uk>, original
 # 2. Uwe Kirbach <U.Kirbach@EnBW.com>