diff --git a/.travis.yml b/.travis.yml
index 6469315..5488293 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: required
+dist: trusty
 
 # install the pre-release chef-dk.  Use chef-stable-precise to install the stable release
 addons:
diff --git a/templates/default/access.erb b/templates/default/access.erb
index 022f7c5..d054fa9 100644
--- a/templates/default/access.erb
+++ b/templates/default/access.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef. Do not hand edit!
+# Local modifications will be overwritten.
 #
 # See man 5 access for format
 
diff --git a/templates/default/aliases.erb b/templates/default/aliases.erb
index 182cbae..58e5031 100644
--- a/templates/default/aliases.erb
+++ b/templates/default/aliases.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # See man 5 aliases for format
 postmaster:    root
diff --git a/templates/default/main.cf.erb b/templates/default/main.cf.erb
index d4b7ae4..57067d2 100644
--- a/templates/default/main.cf.erb
+++ b/templates/default/main.cf.erb
@@ -1,5 +1,6 @@
 ###
-# Generated by Chef for <%= node['fqdn'] %>
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 # Configured as <%= node['postfix']['mail_type'] %>
 ###
 
diff --git a/templates/default/relay_restrictions.erb b/templates/default/relay_restrictions.erb
index 4c404c4..85a9eda 100644
--- a/templates/default/relay_restrictions.erb
+++ b/templates/default/relay_restrictions.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # Attribute name is the domain name, Attribute value is either OK or REJECT
 
diff --git a/templates/default/sasl_passwd.erb b/templates/default/sasl_passwd.erb
index f8b1507..18f16b3 100644
--- a/templates/default/sasl_passwd.erb
+++ b/templates/default/sasl_passwd.erb
@@ -1,2 +1,4 @@
-# This file is generated by Chef for <%= node['fqdn'] %>
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
+#
 <%= node['postfix']['main']['relayhost'] %> <%= @settings['smtp_sasl_user_name'] %>:<%= @settings['smtp_sasl_passwd'] %>
diff --git a/templates/default/sender_canonical.erb b/templates/default/sender_canonical.erb
index 785a1c3..3eb25ef 100644
--- a/templates/default/sender_canonical.erb
+++ b/templates/default/sender_canonical.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # See man 5 canonical for format
 
diff --git a/templates/default/smtp_generic.erb b/templates/default/smtp_generic.erb
index 7aa5d64..47b36d2 100644
--- a/templates/default/smtp_generic.erb
+++ b/templates/default/smtp_generic.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # See man 5 generic for format
 
diff --git a/templates/default/transport.erb b/templates/default/transport.erb
index 4596240..df31153 100644
--- a/templates/default/transport.erb
+++ b/templates/default/transport.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # See man 5 transport for format
 
diff --git a/templates/default/virtual_aliases.erb b/templates/default/virtual_aliases.erb
index fc7e9e1..d1bfadf 100644
--- a/templates/default/virtual_aliases.erb
+++ b/templates/default/virtual_aliases.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # See man 5 virtual for format
 
diff --git a/templates/default/virtual_aliases_domains.erb b/templates/default/virtual_aliases_domains.erb
index a02a35a..d4334b2 100644
--- a/templates/default/virtual_aliases_domains.erb
+++ b/templates/default/virtual_aliases_domains.erb
@@ -1,7 +1,6 @@
 #
-# This file is generated by Chef for <%= node['fqdn'] %>
-#
-# Local changes will be overwritten
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
 #
 # See man 5 virtual for format