diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f455a1..f4a2796 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v2.2.0
+
+### Enhancements
+* Use **comment** filter for ansible_managed, to allow multi-lines.
+
 ## v2.1.0
 
 ### Enhancements
diff --git a/templates/etc/default/xymon-client.j2 b/templates/etc/default/xymon-client.j2
index 2dda1e0..c18b04f 100644
--- a/templates/etc/default/xymon-client.j2
+++ b/templates/etc/default/xymon-client.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 
 # Configure the Xymon client settings.
diff --git a/templates/etc/xymon/apt_no_repo_accept.j2 b/templates/etc/xymon/apt_no_repo_accept.j2
index 6804724..7b6bf27 100644
--- a/templates/etc/xymon/apt_no_repo_accept.j2
+++ b/templates/etc/xymon/apt_no_repo_accept.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 {% for package in xymon_cli__plug_apt_combined_whitelist %}
 {{ package }}
diff --git a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2 b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
index 0898631..4c4f4b0 100644
--- a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2
@@ -1,5 +1,5 @@
 [apt]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_apt_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2 b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
index b512313..e58431a 100644
--- a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
@@ -1,5 +1,5 @@
 [ipmi]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ipmi_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/kern.cfg.j2 b/templates/etc/xymon/clientlaunch.d/kern.cfg.j2
index 0a91960..58601bb 100644
--- a/templates/etc/xymon/clientlaunch.d/kern.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/kern.cfg.j2
@@ -1,5 +1,5 @@
 [kern]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_kern_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2 b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
index a647c53..0508f95 100644
--- a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2
@@ -1,5 +1,5 @@
 [libs]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_libs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2 b/templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2
index 4af3a47..38519cc 100644
--- a/templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2
@@ -1,6 +1,6 @@
 # Requires megaclisas-status package from https://hwraid.le-vert.net/wiki/DebianPackages
 [megaraid]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_megaraid_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2 b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
index ef64224..0b66269 100644
--- a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2
@@ -1,5 +1,5 @@
 [mq]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_mq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/net.cfg.j2 b/templates/etc/xymon/clientlaunch.d/net.cfg.j2
index 1e74a56..4deea13 100644
--- a/templates/etc/xymon/clientlaunch.d/net.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/net.cfg.j2
@@ -1,5 +1,5 @@
 [net]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_net_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2 b/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
index e6e1e8a..3b81dd5 100644
--- a/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
@@ -1,5 +1,5 @@
 [netstats]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_netstats_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2 b/templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2
index 98fd744..d76c16b 100644
--- a/templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2
@@ -1,5 +1,5 @@
 [ntpq]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ntpq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/sge.cfg.j2 b/templates/etc/xymon/clientlaunch.d/sge.cfg.j2
index 7dd0393..65896a4 100644
--- a/templates/etc/xymon/clientlaunch.d/sge.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/sge.cfg.j2
@@ -1,5 +1,5 @@
 [sge]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_sge_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/smart.cfg.j2 b/templates/etc/xymon/clientlaunch.d/smart.cfg.j2
index 0172fa7..3397a58 100644
--- a/templates/etc/xymon/clientlaunch.d/smart.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/smart.cfg.j2
@@ -1,5 +1,5 @@
 [smart]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_smart_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2 b/templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2
index 674a6b1..578a420 100644
--- a/templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2
@@ -1,5 +1,5 @@
 [smartoverall]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_smartoverall_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/temp.cfg.j2 b/templates/etc/xymon/clientlaunch.d/temp.cfg.j2
index d4a3e55..a639ca9 100644
--- a/templates/etc/xymon/clientlaunch.d/temp.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/temp.cfg.j2
@@ -1,5 +1,5 @@
 [temp]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_temp_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2 b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
index 91f0349..4a95ef4 100644
--- a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
+++ b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
@@ -1,5 +1,5 @@
 [zfs]
-	# {{ ansible_managed }}
+	# {{ ansible_managed | comment }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_zfs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
diff --git a/templates/etc/xymon/libs.local.yaml.j2 b/templates/etc/xymon/libs.local.yaml.j2
index 41d9dd1..1f28191 100644
--- a/templates/etc/xymon/libs.local.yaml.j2
+++ b/templates/etc/xymon/libs.local.yaml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 {% set inputmerged = xymon_cli__plug_libs_default_whitelist.copy() %}
 {% set _ = inputmerged.update(xymon_cli__plug_libs_whitelist) %}
diff --git a/templates/etc/xymon/net.yaml.j2 b/templates/etc/xymon/net.yaml.j2
index 81de716..cbe5851 100644
--- a/templates/etc/xymon/net.yaml.j2
+++ b/templates/etc/xymon/net.yaml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 ## From ipr-cnrs.xymon role
 {{ ansible_hostname }}:
   - {{ ansible_default_ipv4.interface }}
diff --git a/templates/usr/lib/xymon/client/ext/sge.sh.j2 b/templates/usr/lib/xymon/client/ext/sge.sh.j2
index 9157ccb..7838860 100755
--- a/templates/usr/lib/xymon/client/ext/sge.sh.j2
+++ b/templates/usr/lib/xymon/client/ext/sge.sh.j2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 # https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
 #
diff --git a/templates/usr/lib/xymon/client/ext/smart.j2 b/templates/usr/lib/xymon/client/ext/smart.j2
index eecdb89..c703aa2 100755
--- a/templates/usr/lib/xymon/client/ext/smart.j2
+++ b/templates/usr/lib/xymon/client/ext/smart.j2
@@ -2,7 +2,7 @@
 # $Id: sensors 70 2011-11-25 09:21:18Z skazi $
 # Author: Jacek Tomasiak <jacek.tomasiak@gmail.com>
 
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 # Thanks to Jacek Tomasiak − skazi0
 # https://github.com/skazi0/xymon-plugins/blob/master/client/ext/smart
diff --git a/templates/usr/lib/xymon/client/ext/smartoverall.j2 b/templates/usr/lib/xymon/client/ext/smartoverall.j2
index c182282..705aa35 100755
--- a/templates/usr/lib/xymon/client/ext/smartoverall.j2
+++ b/templates/usr/lib/xymon/client/ext/smartoverall.j2
@@ -1,7 +1,7 @@
 #!/bin/sh
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 # Source :
 # https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
diff --git a/templates/usr/lib/xymon/client/ext/zfs.j2 b/templates/usr/lib/xymon/client/ext/zfs.j2
index 505ab8b..52e6d13 100755
--- a/templates/usr/lib/xymon/client/ext/zfs.j2
+++ b/templates/usr/lib/xymon/client/ext/zfs.j2
@@ -1,6 +1,6 @@
 #!/bin/ksh
 
-# {{ ansible_managed }}
+# {{ ansible_managed | comment }}
 # From ipr-cnrs.xymon role
 
 # Revision History: