diff --git a/roles/webserver/files/etc/apache2/sites-available/000-default.conf b/roles/webserver/files/etc/apache2/sites-available/000-default.conf
index 28b89e4..998741a 100644
--- a/roles/webserver/files/etc/apache2/sites-available/000-default.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/000-default.conf
@@ -8,7 +8,7 @@
 	# However, you must set it for any further virtual host explicitly.
 	#ServerName www.example.com
 
-	ServerAdmin amcclure@ttm.sh
+	ServerAdmin webmaster@thunix.net
 	DocumentRoot /var/www/thunix.cf
 
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
diff --git a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
index 5251955..0ae1a48 100644
--- a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName ftp.thunix.cf
     DocumentRoot /var/www/ftp.thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -12,7 +12,7 @@
 
     <IfModule mod_ssl.c>
     <VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName ftp.thunix.cf
     DocumentRoot /var/www/ftp.thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
index 7da4955..0bd995b 100644
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
@@ -1,6 +1,6 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName thunix.cf
     DocumentRoot /var/www/thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf
index ace1002..ee38aea 100644
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName thunix.cf
     DocumentRoot /var/www/thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf
index 5c94d4a..f42c1a7 100644
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName thunix.tilde.chat
     DocumentRoot /var/www/thunix/chat
     ErrorLog ${APACHE_LOG_DIR}/error.log
diff --git a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
index 72a2ed2..bf6eaf6 100644
--- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
@@ -1,6 +1,6 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName www.thunix.cf
     DocumentRoot /var/www/thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
diff --git a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf
index d51d4dd..3f66609 100644
--- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
+    ServerAdmin webmaster@thunix.net
     ServerName www.thunix.cf
     DocumentRoot /var/www/thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log