diff --git a/playbooks/tasks/web/nagios-ansible.cfg.j2 b/playbooks/tasks/web/nagios-ansible.cfg.j2
index 28750cc..6ade672 100644
--- a/playbooks/tasks/web/nagios-ansible.cfg.j2
+++ b/playbooks/tasks/web/nagios-ansible.cfg.j2
@@ -1,9 +1,4 @@
-#
-# STOP
-#
-# This file is managed via Ansible; any changes made WILL be overwritten
-# If you need to add site-specific configuration, do it in another file!
-#
+# {{ ansible_managed }}
 
 # Templates
 define host {
diff --git a/roles/common/templates/profile.sh b/roles/common/templates/profile.sh
index 4784960..9cb1910 100644
--- a/roles/common/templates/profile.sh
+++ b/roles/common/templates/profile.sh
@@ -1,7 +1,5 @@
 # vim:ft=sh
-# This file managed via Ansible; do not edit!
-# If you want to override any of this, make another script in /etc/profile.d
-# Or better yet, if you're just an unprivileged user, make a ~/.bashrc
+# {{ ansible_managed }}
 
 # If not running interactively, bail
 [ -z "$PS1" ] && return
diff --git a/roles/desktop/files/portage/sets/ansible b/roles/desktop/files/portage/sets/ansible
index 45907ec..4cf4063 100644
--- a/roles/desktop/files/portage/sets/ansible
+++ b/roles/desktop/files/portage/sets/ansible
@@ -1,5 +1,4 @@
-# DO NOT EDIT THIS FILE
-# This file is managed via ansible and WILL be overwritten!
+# {{ ansible_managed }}
 
 # System apps
 app-admin/ansible
diff --git a/roles/desktop/templates/90-mouse-acceleration.conf b/roles/desktop/templates/90-mouse-acceleration.conf
index fe4cd5a..89ad3be 100644
--- a/roles/desktop/templates/90-mouse-acceleration.conf
+++ b/roles/desktop/templates/90-mouse-acceleration.conf
@@ -1,4 +1,4 @@
-# This file managed via Ansible
+# {{ ansible_managed }}
 # vim:ft=xf86conf
 Section "InputClass"
 	Identifier "mouse"
diff --git a/roles/desktop/templates/90-touchpad.conf b/roles/desktop/templates/90-touchpad.conf
index 1d6a174..c54e5f1 100644
--- a/roles/desktop/templates/90-touchpad.conf
+++ b/roles/desktop/templates/90-touchpad.conf
@@ -1,4 +1,4 @@
-# This file managed via Ansible
+# {{ ansible_managed }}
 # vim:ft=xf86conf
 Section "InputClass"
 	Identifier "touchpad"
diff --git a/roles/pulseaudio/templates/pulse-client.conf b/roles/pulseaudio/templates/pulse-client.conf
index 116187e..0b2e703 100644
--- a/roles/pulseaudio/templates/pulse-client.conf
+++ b/roles/pulseaudio/templates/pulse-client.conf
@@ -1,3 +1,3 @@
-# Managed via Ansible
+# {{ ansible_managed }}
 autospawn = no
 default-server = unix:/tmp/pulse-server
diff --git a/roles/pulseaudio/templates/pulse-daemon.conf b/roles/pulseaudio/templates/pulse-daemon.conf
index 35c23cc..f91b3f6 100644
--- a/roles/pulseaudio/templates/pulse-daemon.conf
+++ b/roles/pulseaudio/templates/pulse-daemon.conf
@@ -1,5 +1,5 @@
 # See pulse-daemon.conf(5) for more info
-# This file managed via Ansible
+# {{ ansible_managed }}
 
 # Bugfixes for my desktop's audio card
 realtime-scheduling = no # Fixes a weird stutter issue