diff --git a/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/000-default-ssl.conf
similarity index 97%
rename from roles/webserver/files/etc/apache2/sites-available/default-ssl.conf
rename to roles/webserver/files/etc/apache2/sites-available/000-default-ssl.conf
index f5d8a5c..f0cb9e2 100644
--- a/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/000-default-ssl.conf
@@ -1,8 +1,8 @@
 <IfModule mod_ssl.c>
 	<VirtualHost _default_:443>
+		ServerName localhost
 		ServerAdmin webmaster@thunix.net
-
-		DocumentRoot /var/www/thunix.cf
+		DocumentRoot /var/www/000-default
 
 		# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 		# error, crit, alert, emerg.
@@ -10,8 +10,8 @@
 		# modules, e.g.
 		#LogLevel info ssl:warn
 
-		ErrorLog ${APACHE_LOG_DIR}/error.log
-		CustomLog ${APACHE_LOG_DIR}/access.log combined
+		ErrorLog ${APACHE_LOG_DIR}/error-000-default.log
+		CustomLog ${APACHE_LOG_DIR}/access-000-default.log combined
 
 		# For most configuration files from conf-available/, which are
 		# enabled or disabled at a global level, it is possible to
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 998741a..180dda8 100644
--- a/roles/webserver/files/etc/apache2/sites-available/000-default.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/000-default.conf
@@ -6,10 +6,10 @@
 	# match this virtual host. For the default virtual host (this file) this
 	# value is not decisive as it is used as a last resort host regardless.
 	# However, you must set it for any further virtual host explicitly.
-	#ServerName www.example.com
+	ServerName localhost
 
 	ServerAdmin webmaster@thunix.net
-	DocumentRoot /var/www/thunix.cf
+	DocumentRoot /var/www/000-default
 
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
@@ -17,8 +17,8 @@
 	# modules, e.g.
 	#LogLevel info ssl:warn
 
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
+	ErrorLog ${APACHE_LOG_DIR}/error-000-default.log
+	CustomLog ${APACHE_LOG_DIR}/access-000-default.log combined
 
 	# For most configuration files from conf-available/, which are
 	# enabled or disabled at a global level, it is possible to
diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml
index 0bb4fbc..0d2fbad 100644
--- a/roles/webserver/tasks/apache.yml
+++ b/roles/webserver/tasks/apache.yml
@@ -15,6 +15,7 @@
     src: ../files/etc/apache2/sites-available/{{ item }}.conf
     dest: /etc/apache2/sites-available/{{ item }}.conf
   loop:
+    - 000-default
     - thunix.net
     - www.thunix.net
     - ftp.thunix.net
@@ -32,6 +33,7 @@
     dest: /etc/apache2/sites-enabled/{{ item }}.conf
     state: link
   loop:
+    - 000-default
     - thunix.net
     - www.thunix.net
     - ftp.thunix.net