diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml
index ba69ec1..b855745 100644
--- a/roles/shell/tasks/users.yml
+++ b/roles/shell/tasks/users.yml
@@ -86,4 +86,5 @@
 - include: users/responsibleracoon.yml
 - include: users/transfusion.yml
 - include: users/adam.yml
-- include: users/audiofile.yml
\ No newline at end of file
+- include: users/audiofile.yml
+- include: users/vgk.yml
diff --git a/roles/shell/tasks/users/vgk.yml b/roles/shell/tasks/users/vgk.yml
new file mode 100644
index 0000000..3eec760
--- /dev/null
+++ b/roles/shell/tasks/users/vgk.yml
@@ -0,0 +1,15 @@
+---
+- name: Setting up vgk 
+  user:
+    name: vgk
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/vgk
+- authorized_key:
+    user: vgk
+    state: present
+    key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAeeIoSAdzpBzC/ZHphm5IIVYU2yHaONSvrMUm9xqn+jGnbK9iJaAENCvZIFI22AbIwwKb5tpDjKTdtkWHRZ7WU= ~vgk"
diff --git a/roles/webserver/files/autoconfig.xml b/roles/webserver/files/autoconfig.xml
new file mode 100644
index 0000000..31b4acd
--- /dev/null
+++ b/roles/webserver/files/autoconfig.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig version="1.1">
+  <emailProvider id="thunix.net">
+    <domain>thunix.net</domain>
+    <displayName>Thunix EMail</displayName>
+    <displayShortName>thunix</displayShortName>
+    <incomingServer type="imap">
+      <hostname>thunix.net</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>thunix.net</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </outgoingServer>
+    <documentation url="https://thunix.net/faq.php">
+      <descr lang="en">Generic settings page</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/roles/webserver/files/etc/apache2/sites-available/autoconfig.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/autoconfig.thunix.net.conf
new file mode 100644
index 0000000..04985f7
--- /dev/null
+++ b/roles/webserver/files/etc/apache2/sites-available/autoconfig.thunix.net.conf
@@ -0,0 +1,32 @@
+<VirtualHost *:80>
+	# The ServerName directive sets the request scheme, hostname and port that
+	# the server uses to identify itself. This is used when creating
+	# redirection URLs. In the context of virtual hosts, the ServerName
+	# specifies what hostname must appear in the request's Host: header to
+	# 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
+
+	ServerAdmin webmaster@thunix.net
+	DocumentRoot /var/www/autoconfig
+  DirectoryIndex autoconfig.xml
+
+	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+	# error, crit, alert, emerg.
+	# It is also possible to configure the loglevel for particular
+	# modules, e.g.
+	#LogLevel info ssl:warn
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	# For most configuration files from conf-available/, which are
+	# enabled or disabled at a global level, it is possible to
+	# include a line for only one particular virtual host. For example the
+	# following line enables the CGI configuration for this host only
+	# after it has been globally disabled with "a2disconf".
+	#Include conf-available/serve-cgi-bin.conf
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/roles/webserver/tasks/codedeploy.yml b/roles/webserver/tasks/codedeploy.yml
index a41ed11..2079f9a 100644
--- a/roles/webserver/tasks/codedeploy.yml
+++ b/roles/webserver/tasks/codedeploy.yml
@@ -9,3 +9,17 @@
     repo: 'https://tildegit.org/thunix/thunix_gopher.git'
     dest: /var/gopher
     force: yes
+
+- file:
+    path: /var/www/autoconfig
+    state: directory
+    mode: 0755
+    owner: root
+    group: root
+
+- copy:
+    src: ../files/autoconfig.xml
+    dest: /var/www/autoconfig/autoconfig.xml
+    mode: 0755
+    owner: root
+    group: root