diff --git a/templates/bareos-dir.conf.j2 b/templates/bareos-dir.conf.j2
index 85ed301..f9d8185 100644
--- a/templates/bareos-dir.conf.j2
+++ b/templates/bareos-dir.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 Director {
   Name = {{ bareos_server_name }}
diff --git a/templates/bconsole.conf.j2 b/templates/bconsole.conf.j2
index fe60ab2..01457aa 100644
--- a/templates/bconsole.conf.j2
+++ b/templates/bconsole.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 Director {
   Name = {{ bareos_server_name }}
diff --git a/templates/client.conf.j2 b/templates/client.conf.j2
index c3184f0..ccd030b 100644
--- a/templates/client.conf.j2
+++ b/templates/client.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 Client {
   Name = "{{ bareos_client_name }}"
diff --git a/templates/server-bareos-dir.conf.j2 b/templates/server-bareos-dir.conf.j2
index 9e7f6a7..8338135 100644
--- a/templates/server-bareos-dir.conf.j2
+++ b/templates/server-bareos-dir.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 Director {
   Name = {{ bareos_server_name }}
diff --git a/templates/server-catalog.conf.j2 b/templates/server-catalog.conf.j2
index a825814..98ce69e 100644
--- a/templates/server-catalog.conf.j2
+++ b/templates/server-catalog.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 Catalog {
   Name = database
   dbdriver = "{{ bareos_server_database_type }}"
diff --git a/templates/server-client.conf.j2 b/templates/server-client.conf.j2
index d577b28..f678a23 100644
--- a/templates/server-client.conf.j2
+++ b/templates/server-client.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for client_name, client in bareos_server_clients.items() %}
 
 Client {
diff --git a/templates/server-console.conf.j2 b/templates/server-console.conf.j2
index 96a9c22..4176fa0 100644
--- a/templates/server-console.conf.j2
+++ b/templates/server-console.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for user_name, user in bareos_server_users.items() %}
 
 Console {
diff --git a/templates/server-fileset.conf.j2 b/templates/server-fileset.conf.j2
index bc23307..ead8340 100644
--- a/templates/server-fileset.conf.j2
+++ b/templates/server-fileset.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for fileset_name, fileset in bareos_server_filesets.items() %}
 
 FileSet {
diff --git a/templates/server-job.conf.j2 b/templates/server-job.conf.j2
index 8a8291b..631b3eb 100644
--- a/templates/server-job.conf.j2
+++ b/templates/server-job.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for client_name, client in bareos_server_clients.items() %}
 {% for job_name, job in client.jobs.items() %}
 
diff --git a/templates/server-pool.conf.j2 b/templates/server-pool.conf.j2
index 46cb8db..36f4caa 100644
--- a/templates/server-pool.conf.j2
+++ b/templates/server-pool.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for client_name, client in bareos_server_clients.items() %}
 
 Pool {
diff --git a/templates/server-profile.conf.j2 b/templates/server-profile.conf.j2
index 40488ef..812987e 100644
--- a/templates/server-profile.conf.j2
+++ b/templates/server-profile.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for profile_name, acls in bareos_server_profiles.items() %}
 
 Profile {
diff --git a/templates/server-schedule.conf.j2 b/templates/server-schedule.conf.j2
index a67cc4e..9840897 100644
--- a/templates/server-schedule.conf.j2
+++ b/templates/server-schedule.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for schedule_name, schedule_runs in bareos_server_schedules.items() %}
 
 Schedule {
diff --git a/templates/server-storage.conf.j2 b/templates/server-storage.conf.j2
index a4c835c..7b25f3b 100644
--- a/templates/server-storage.conf.j2
+++ b/templates/server-storage.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for storage_name, storage in bareos_server_storages.items() %}
 
 Storage {
diff --git a/templates/storage-bareos-sd.conf.j2 b/templates/storage-bareos-sd.conf.j2
index fc022da..b2cc32a 100644
--- a/templates/storage-bareos-sd.conf.j2
+++ b/templates/storage-bareos-sd.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 Storage {
   Name = {{ bareos_storage_name }}
diff --git a/templates/storage-device.conf.j2 b/templates/storage-device.conf.j2
index d6b88f1..e84dc61 100644
--- a/templates/storage-device.conf.j2
+++ b/templates/storage-device.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 {% for device_name, device in bareos_storage_devices.items() %}
 
 Device {