diff --git a/host_vars/webserver b/host_vars/webserver
index 346b32f8273426bdd6c138adc599d840fa7eb018..972483407f015544dfb8181580e45635571accc9 100644
--- a/host_vars/webserver
+++ b/host_vars/webserver
@@ -23,6 +23,7 @@ webserver_domains:
   - "ldap"
   - "mattermost"
   - "pad"
+  - "wiki"
   
 administratorenteam:
   - "void"
diff --git a/webserver/docker_dokuwiki/files/Dockerfile b/webserver/docker_dokuwiki/files/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..74486d9cdd0b08f3af1c24fc1deefb7454c980fd
--- /dev/null
+++ b/webserver/docker_dokuwiki/files/Dockerfile
@@ -0,0 +1,16 @@
+FROM php:7.1-apache
+
+# Upload-Limits hoch setzen (Edit by Parad0x)
+RUN touch /usr/local/etc/php/conf.d/uploads.ini \
+    && echo "upload_max_filesize = 10M;" >> /usr/local/etc/php/conf.d/uploads.ini \
+    && echo "post_max_size = 10M;" >> /usr/local/etc/php/conf.d/uploads.ini
+
+# Change apache settings
+RUN a2enmod rewrite
+ 
+# Expose ports
+EXPOSE 80
+
+# startup
+CMD ["apache2-foreground"]
+
diff --git a/webserver/docker_dokuwiki/tasks/main.yml b/webserver/docker_dokuwiki/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..81ec5cb21d914501c17733edb4e6bcc47de8923f
--- /dev/null
+++ b/webserver/docker_dokuwiki/tasks/main.yml
@@ -0,0 +1,36 @@
+---
+- name: create folder struct for dokuwiki
+  file: 
+    path: "/srv/dokuwiki/" 
+    state: "directory"
+
+- name: create folder struct for dokuwiki 
+  file: 
+    path: "/tmp/dokuwiki_docker/" 
+    state: "directory"
+
+- name: copy Dockerfile 
+  copy:
+    src: Dockerfile
+    dest: /tmp/dokuwiki_docker/Dockerfile
+
+- name: Get a timestamp
+  command: "date +%Y%m%d%H%M%S"
+  register: timestamp
+
+- name: build the image 
+  docker_image: 
+    name: "dokuwiki-{{ timestamp.stdout }}"
+    path: /tmp/dokuwiki_docker/
+    state: present
+
+- name: start dokuwiki docker
+  docker_container: 
+    name: dokuwiki-app
+    image: "dokuwiki-{{ timestamp.stdout }}"
+    state: started
+    restart_policy: always
+    volumes:
+      - /srv/dokuwiki:/var/www/html
+    ports:
+      - 127.0.0.1:42005:80
diff --git a/webserver/main.yml b/webserver/main.yml
index f6d42f9b1f0c04ac067832da6b050301f83485f0..3113036531d199fabf8f90be2a26cbb1aae4554e 100644
--- a/webserver/main.yml
+++ b/webserver/main.yml
@@ -5,6 +5,7 @@
   roles:
     - { role: nginx, tags: nginx }
     - { role: docker, tags: docker }
+    - { role: docker_dokuwiki, tags: dokuwiki }
     - { role: docker_etherpad, tags: etherpad }
     - { role: docker_gitlab, tags: gitlab }
     - { role: docker_ldap, tags: ldap }
diff --git a/webserver/nginx/includes/wiki b/webserver/nginx/includes/wiki
new file mode 100644
index 0000000000000000000000000000000000000000..a49019942bccee60ee2bab7fcf91db2c109639ba
--- /dev/null
+++ b/webserver/nginx/includes/wiki
@@ -0,0 +1,12 @@
+
+	location /  {
+
+        	proxy_set_header        Host $host;
+        	proxy_set_header        X-Real-IP $remote_addr;
+	        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        	proxy_set_header        X-Forwarded-Proto $scheme;
+
+	        proxy_pass      http://127.0.0.1:42005/;
+        	proxy_redirect  off;
+
+    }