diff --git a/webserver/docker_etherpad/tasks/main.yml b/webserver/docker_etherpad/tasks/main.yml
index fee6d10b0effab0fa51d5dc4ab9c7638ef5592e1..84cee754129881f1c31a412a5a80809c86ae9576 100644
--- a/webserver/docker_etherpad/tasks/main.yml
+++ b/webserver/docker_etherpad/tasks/main.yml
@@ -4,28 +4,13 @@
     path: "/srv/etherpad/" 
     state: "directory"
   
-- name: start mysql docker
-  docker_container: 
-    name: etherpad-db
-    image: mysql:5.7
-    hostname: etherpad-db
-    state: started
-    restart_policy: always
-    volumes:
-      - /srv/etherpad/:/var/lib/mysql
-    env:
-      MYSQL_ROOT_PASSWORD: warpzone
-     
+- name: Konfig-Datei erstellen
+  template: 
+    src: "docker-compose.yml" 
+    dest: "/srv/etherpad/docker-compose.yml"
+
 - name: start etherpad docker
-  docker_container: 
-    name: etherpad-app
-    image: tvelocity/etherpad-lite:latest
-    state: started
-    restart_policy: always
-    env: 
-      ETHERPAD_TITLE: warpzone Etherpad Lite  
-      ETHERPAD_PORT: 42003
-    ports:
-      - 127.0.0.1:42003:42003
-    links:
-      - etherpad-db:mysql
+  docker_service:
+    project_src: /srv/etherpad/
+    state: present
+  
diff --git a/webserver/docker_etherpad/templates/docker-compose.yml b/webserver/docker_etherpad/templates/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..82960b3aea455bd68475ee48f227cbc8dd0f0f97
--- /dev/null
+++ b/webserver/docker_etherpad/templates/docker-compose.yml
@@ -0,0 +1,34 @@
+
+version: "3"
+
+services:
+
+  db:
+
+    image: mysql:5.7
+    restart: always
+    volumes:
+      - /srv/etherpad/:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: warpzone
+
+  app:
+
+    image: tvelocity/etherpad-lite:latest
+    restart: always
+    depends_on:
+      - db
+    links:
+      - db:mysql  
+    ports:
+      - 127.0.0.1:42003:42003
+    environment: 
+      ETHERPAD_TITLE: warpzone Etherpad Lite  
+      ETHERPAD_PORT: 42003
+      ETHERPAD_DB_USER: root
+      ETHERPAD_DB_PASSWORD: warpzone
+      MYSQL_PORT: tcp://db:3306
+      MYSQL_PORT_3306_TCP: tcp://db:3306
+      MYSQL_PORT_3306_TCP_ADDR: db
+      MYSQL_PORT_3306_TCP_PORT: 3306
+      MYSQL_PORT_3306_TCP_PORT: tcp