diff --git a/templates/etc/ca-certificates.conf.j2 b/templates/etc/ca-certificates.conf.j2
index 2cb0a10..1ba931a 100644
--- a/templates/etc/ca-certificates.conf.j2
+++ b/templates/etc/ca-certificates.conf.j2
@@ -1,4 +1,4 @@
-# This file is managed remotely, some changes might be overwritten
+# {{ ansible_managed }}
 #
 # This file lists certificates that you wish to use or to ignore to be
 # installed in /etc/ssl/certs.
diff --git a/templates/etc/pki/Makefile.j2 b/templates/etc/pki/Makefile.j2
index a4dd90b..98c1c52 100644
--- a/templates/etc/pki/Makefile.j2
+++ b/templates/etc/pki/Makefile.j2
@@ -1,4 +1,4 @@
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 PKI_BASE_PATH			= {{ pki_base_path      | default('/etc/pki') }}
 
diff --git a/templates/etc/pki/realm/Makefile.j2 b/templates/etc/pki/realm/Makefile.j2
index 59c26ee..4021a8f 100644
--- a/templates/etc/pki/realm/Makefile.j2
+++ b/templates/etc/pki/realm/Makefile.j2
@@ -1,4 +1,4 @@
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 # PKI Makefile - client endpoint
 # Copyright (C) 2014 Maciej Delmanowski <drybjed@gmail.com>
diff --git a/templates/etc/pki/realm/templates/gnutls/default.cnf.j2 b/templates/etc/pki/realm/templates/gnutls/default.cnf.j2
index 416a611..75602cf 100644
--- a/templates/etc/pki/realm/templates/gnutls/default.cnf.j2
+++ b/templates/etc/pki/realm/templates/gnutls/default.cnf.j2
@@ -1,5 +1,5 @@
 {% set item = item.1 %}
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 # X.509 Certificate options
 #
diff --git a/templates/etc/pki/realm/templates/openssl/default.cnf.j2 b/templates/etc/pki/realm/templates/openssl/default.cnf.j2
index c189fe5..9158580 100644
--- a/templates/etc/pki/realm/templates/openssl/default.cnf.j2
+++ b/templates/etc/pki/realm/templates/openssl/default.cnf.j2
@@ -1,6 +1,6 @@
 {% set realm = item.0 %}
 {% set certificate = item.1 %}
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 HOME				= .
 RANDFILE			= $ENV::HOME/.rnd
diff --git a/templates/secret/pki/authorities/authority/Makefile.j2 b/templates/secret/pki/authorities/authority/Makefile.j2
index 0a1d74f..a59fb7e 100644
--- a/templates/secret/pki/authorities/authority/Makefile.j2
+++ b/templates/secret/pki/authorities/authority/Makefile.j2
@@ -1,4 +1,4 @@
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 # ---- Ansible control variables ----
 
diff --git a/templates/secret/pki/authorities/authority/openssl.cnf.j2 b/templates/secret/pki/authorities/authority/openssl.cnf.j2
index 5e59020..92bb59a 100644
--- a/templates/secret/pki/authorities/authority/openssl.cnf.j2
+++ b/templates/secret/pki/authorities/authority/openssl.cnf.j2
@@ -1,5 +1,5 @@
 {% set authority = item %}
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 HOME				= ./.db
 RANDFILE			= $HOME/private/.random_seed
diff --git a/templates/secret/pki/make.sh.j2 b/templates/secret/pki/make.sh.j2
index 40edfbe..27007d5 100755
--- a/templates/secret/pki/make.sh.j2
+++ b/templates/secret/pki/make.sh.j2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This file is managed remotely, all changes will be lost
+# {{ ansible_managed }}
 
 set -e