diff --git a/verwaltung/docker_nextcloud/tasks/main.yml b/verwaltung/docker_nextcloud/tasks/main.yml
index d0c9e345b7e91b9fa16c30b896328a88a3b7daf1..6297317a367437161f268d6f5e260689e88c15ff 100644
--- a/verwaltung/docker_nextcloud/tasks/main.yml
+++ b/verwaltung/docker_nextcloud/tasks/main.yml
@@ -10,8 +10,9 @@
 
 - include: ../functions/get_secret.yml
   with_items:
-   - { path: /srv/nextcloud/mysql_admin_pass,  length: 24 }
-   - { path: /srv/nextcloud/mysql_user_pass,  length: 12 }
+    - { path: /srv/nextcloud/nextcloud_admin_pass,  length: 24 }
+    - { path: /srv/nextcloud/mysql_admin_pass,  length: 24 }
+    - { path: /srv/nextcloud/mysql_user_pass,  length: 12 }
 
 - name: create folder struct for nextcloud
   file: 
diff --git a/verwaltung/docker_nextcloud/templates/docker-compose.yml b/verwaltung/docker_nextcloud/templates/docker-compose.yml
index 9729b030db3a3983e89013c05cb14152e33f0370..187c74567a76f5806e97e525bda4f29e9a88db3a 100644
--- a/verwaltung/docker_nextcloud/templates/docker-compose.yml
+++ b/verwaltung/docker_nextcloud/templates/docker-compose.yml
@@ -2,6 +2,11 @@ version: "3"
 
 services:
 
+  redis:
+
+    image: redis:5.0.8
+    restart: always
+
   mysql:
 
     image: mariadb:10.4.10
@@ -16,7 +21,7 @@ services:
 
   app:
 
-    image: nextcloud:17.0.1-apache
+    image: nextcloud:18.0.2-apache
     restart: always
     ports:
       - 127.0.0.1:42002:80
@@ -24,7 +29,16 @@ services:
       - /srv/nextcloud/data/:/var/www/html/
       - /srv/nextcloud/tmp/:/tmp/nextcloudtemp/
       - /srv/nextcloud/memory-limit.ini:/usr/local/etc/php/conf.d/memory-limit.ini:ro
-
+    environment:
+      REDIS_HOST: redis
+      MYSQL_DATABASE: nextcloud
+      MYSQL_USER: nextcloud
+      MYSQL_PASSWORD: "{{ mysql_user_pass }}"
+      MYSQL_HOST: mysql
+      NEXTCLOUD_ADMIN_USER: "admin"
+      NEXTCLOUD_ADMIN_PASSWORD: "{{nextcloud_admin_pass}}"
+        
+        
   # Build from Howto: https://nerdblog.steinkopf.net/2018/07/nextcloud-volltext-index-mit-docker-und-elasticsearch/
   elasticsearch: