diff --git a/roles/nextcloud-docker/files/nextcloud/Dockerfile.cron b/roles/nextcloud-docker/files/nextcloud/Dockerfile.cron
deleted file mode 100644
index 24ffc7a..0000000
--- a/roles/nextcloud-docker/files/nextcloud/Dockerfile.cron
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM nextcloud:fpm
-
-RUN apt-get update && apt-get install -y \
-  supervisor \
-  cron \
-  vim \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir /var/log/supervisord /var/run/supervisord && \ 
-  echo "*/15 * * * * su - www-data -s /bin/bash -c \"php -f /var/www/html/cron.php\""| crontab -
-
-COPY supervisord.conf /etc/supervisor/supervisord.conf
-
-CMD ["/usr/bin/supervisord"]
-
diff --git a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
new file mode 100644
index 0000000..4443ff4
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
@@ -0,0 +1,4 @@
+FROM nextcloud:fpm
+
+COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
+
diff --git a/roles/nextcloud-docker/files/nextcloud/app/redis.config.php b/roles/nextcloud-docker/files/nextcloud/app/redis.config.php
new file mode 100644
index 0000000..2baa9d3
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/app/redis.config.php
@@ -0,0 +1,9 @@
+<?php
+$CONFIG = array (
+  'memcache.locking' => '\OC\Memcache\Redis',
+  'redis' => array(
+    'host' => 'redis',
+    'port' => 6379,
+  ),
+);
+
diff --git a/roles/nextcloud-docker/files/nextcloud/config/.htaccess b/roles/nextcloud-docker/files/nextcloud/config/.htaccess
deleted file mode 100755
index 79e65ab..0000000
--- a/roles/nextcloud-docker/files/nextcloud/config/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-# line below if for Apache 2.4
-<ifModule mod_authz_core.c>
-Require all denied
-</ifModule>
-
-# line below if for Apache 2.2
-<ifModule !mod_authz_core.c>
-deny from all
-</ifModule>
-
-# section for Apache 2.2 and 2.4
-<ifModule mod_autoindex.c>
-IndexIgnore *
-</ifModule>
-
diff --git a/roles/nextcloud-docker/files/nextcloud/config/apcu.config.php b/roles/nextcloud-docker/files/nextcloud/config/apcu.config.php
deleted file mode 100755
index 69fed87..0000000
--- a/roles/nextcloud-docker/files/nextcloud/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/roles/nextcloud-docker/files/nextcloud/config/apps.config.php b/roles/nextcloud-docker/files/nextcloud/config/apps.config.php
deleted file mode 100755
index a4bed83..0000000
--- a/roles/nextcloud-docker/files/nextcloud/config/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$CONFIG = array (
-  "apps_paths" => array (
-      0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
-      ),
-      1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
-      ),
-  ),
-);
diff --git a/roles/nextcloud-docker/files/nextcloud/config/nginx.conf b/roles/nextcloud-docker/files/nextcloud/config/nginx.conf
deleted file mode 100644
index 77716a6..0000000
--- a/roles/nextcloud-docker/files/nextcloud/config/nginx.conf
+++ /dev/null
@@ -1,111 +0,0 @@
-user www-data;
-
-events {
-  worker_connections 768;
-}
-
-http {
-  upstream backend {
-      server app:9000;
-  }
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
-
-  server {
-    listen 80;
-    
-    # Add headers to serve security related headers
-    #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
-    add_header X-Content-Type-Options nosniff;
-    add_header X-XSS-Protection "1; mode=block";
-    add_header X-Robots-Tag none;
-    add_header X-Download-Options noopen;
-    add_header X-Permitted-Cross-Domain-Policies none;
-
-    root /var/www/html;
-    client_max_body_size 10G; # 0=unlimited - set max upload size
-    fastcgi_buffers 64 4K;
-
-    gzip off;
-
-    index index.php;
-    error_page 403 /core/templates/403.php;
-    error_page 404 /core/templates/404.php;
-
-    rewrite ^/.well-known/carddav /remote.php/dav/ permanent;
-    rewrite ^/.well-known/caldav /remote.php/dav/ permanent;
- 
-    location = /robots.txt {
-      allow all;
-      log_not_found off;
-      access_log off;
-    }
-      
-    location ~ ^/(build|tests|config|lib|3rdparty|templates|data)/ {
-      deny all;
-    }
-
-    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
-      deny all;
-    }
-  
-    location / {
-      rewrite ^/remote/(.*) /remote.php last;
-      rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
-      try_files $uri $uri/ =404;
-    }
-  
-    location ~ \.php(?:$|/) {
-      fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      include fastcgi_params;
-      fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-      fastcgi_param PATH_INFO $fastcgi_path_info;
-      fastcgi_param HTTPS on;
-      fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
-      fastcgi_pass backend;
-      fastcgi_intercept_errors on;
-    }
-
-    # Adding the cache control header for js and css files
-    # Make sure it is BELOW the location ~ \.php(?:$|/) { block
-    location ~* \.(?:css|js)$ {
-      add_header Cache-Control "public, max-age=7200";
-      # Add headers to serve security related headers
-      #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
-      add_header X-Content-Type-Options nosniff;
-      add_header X-Frame-Options "SAMEORIGIN";
-      add_header X-XSS-Protection "1; mode=block";
-      add_header X-Robots-Tag none;
-      add_header X-Download-Options noopen;
-      add_header X-Permitted-Cross-Domain-Policies none;
-      # Optional: Don't log access to assets
-      access_log off;
-    }
-
-    # Optional: Don't log access to other assets
-    location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|swf)$ {
-      access_log off;
-    }
-
-    # collabora static files
-    location ^~ /loleaflet {
-        proxy_pass https://collabora:9980;
-        proxy_set_header Host $http_host;
-    }
-
-    # collabora WOPI discovery URL
-    location ^~ /hosting/discovery {
-        proxy_pass https://collabora:9980;
-        proxy_set_header Host $http_host;
-    }
-
-    # collabora websockets, download, presentation and image upload
-    location ^~ /lool {
-        proxy_pass https://collabora:9980;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $http_host;
-    }
-  }
-}
-
diff --git a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
index ca4c7ea..46ec430 100644
--- a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
+++ b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '3'
 
 networks:
   proxy-tier:
@@ -7,43 +7,63 @@ networks:
 
 services:
   web:
-    image: nginx
+    build: ./web
     volumes:
-      - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /var/lib/nextcloud:/var/www/html:ro
       - /etc/localtime:/etc/localtime:ro
-    links:
-      - app
-      - collabora
-    volumes_from:
-      - app
     environment:
       - VIRTUAL_HOST=${CLOUD_DOMAIN}
       - VIRTUAL_NETWORK=nginx-proxy
       - VIRTUAL_PORT=80
+    depends_on:
+      - app
+      - collabora
     networks:
       - proxy-tier
+      - default
     restart: always
 
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile.cron
-    links:
-      - db
+    build: ./app
     volumes:
-      - /var/lib/nextcloud/apps:/var/www/html/apps
-      - ./config:/var/www/html/config
-      - /var/lib/nextcloud/data:/var/www/html/data
+      - ./config/config.php:/var/www/html/config/config.php
+      - /var/lib/nextcloud:/var/www/html
       - /media:/media
       - /etc/localtime:/etc/localtime:ro
-    networks:
-      - proxy-tier
+    environment:
+      - MYSQL_HOST=db
+    env_file:
+      - db.env
+    depends_on:
+      - db
+      - redis
     restart: always
 
+  cron:
+    build: ./app
+    restart: always
+    volumes:
+      - /var/lib/nextcloud:/var/www/html
+    user: www-data
+    entrypoint: |
+      bash -c 'bash -s <<EOF
+        trap "break;exit" SIGHUP SIGINT SIGTERM
+        while [ ! -f /var/www/html/config/config.php ]; do
+          sleep 1
+        done
+        while true; do
+          php -f /var/www/html/cron.php
+          sleep 15m
+        done
+      EOF'
+    depends_on:
+      - db
+      - redis
+
   db:
     image: mariadb
     volumes:
-      - /var/lib/nextcloud/db:/var/lib/mysql
+      - /var/lib/mariadb/nextcloud:/var/lib/mysql
       - /backups/nextcloud:/backups
       - /etc/localtime:/etc/localtime:ro
     environment:
@@ -51,14 +71,12 @@ services:
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-    networks:
-      - proxy-tier
+    env_file:
+      - db.env
     restart: always
 
   redis:
     image: redis
-    networks:
-      - proxy-tier
     restart: always
 
   collabora:
@@ -72,9 +90,10 @@ services:
       - VIRTUAL_HOST=${COLLABORA_DOMAIN}
       - VIRTUAL_NETWORK=nginx-proxy
       - VIRTUAL_PORT=9980
-        #- VIRTUAL_PROTO=https
+    #  - VIRTUAL_PROTO=https
 #      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
 #      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
     networks:
       - proxy-tier
+      - default
     restart: always
diff --git a/roles/nextcloud-docker/files/nextcloud/supervisord.conf b/roles/nextcloud-docker/files/nextcloud/supervisord.conf
deleted file mode 100644
index 3fc5490..0000000
--- a/roles/nextcloud-docker/files/nextcloud/supervisord.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/var/log/supervisord/supervisord.log
-pidfile=/var/run/supervisord/supervisord.pid
-childlogdir=/var/log/supervisord/
-logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
-logfile_backups=10                              ; number of backed up logfiles
-loglevel=error
-
-[program:php-fpm]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=php-fpm
-
-[program:cron]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=cron -f
-
diff --git a/roles/nextcloud-docker/files/nextcloud/web/Dockerfile b/roles/nextcloud-docker/files/nextcloud/web/Dockerfile
new file mode 100644
index 0000000..b4a8d47
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/web/Dockerfile
@@ -0,0 +1,4 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
diff --git a/roles/nextcloud-docker/files/nextcloud/web/nginx.conf b/roles/nextcloud-docker/files/nextcloud/web/nginx.conf
new file mode 100644
index 0000000..bc4f915
--- /dev/null
+++ b/roles/nextcloud-docker/files/nextcloud/web/nginx.conf
@@ -0,0 +1,155 @@
+user  www-data;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    upstream php-handler {
+        server app:9000;
+    }
+
+    server {
+        listen 80;
+
+        # Add headers to serve security related headers
+        # Before enabling Strict-Transport-Security headers please read into this
+        # topic first.
+        # add_header Strict-Transport-Security "max-age=15768000;
+        # includeSubDomains; preload;";
+        #
+        # WARNING: Only add the preload option once you read about
+        # the consequences in https://hstspreload.org/. This option
+        # will add the domain to a hardcoded list that is shipped
+        # in all major browsers and getting removed from this list
+        # could take several months.
+        add_header X-Content-Type-Options nosniff;
+        add_header X-XSS-Protection "1; mode=block";
+        add_header X-Robots-Tag none;
+        add_header X-Download-Options noopen;
+        add_header X-Permitted-Cross-Domain-Policies none;
+
+        root /var/www/html;
+
+        location = /robots.txt {
+            allow all;
+            log_not_found off;
+            access_log off;
+        }
+
+        # The following 2 rules are only needed for the user_webfinger app.
+        # Uncomment it if you're planning to use this app.
+        #rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+        #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json
+        # last;
+
+        location = /.well-known/carddav {
+            return 301 $scheme://$host/remote.php/dav;
+        }
+        location = /.well-known/caldav {
+            return 301 $scheme://$host/remote.php/dav;
+        }
+
+        # set max upload size
+        client_max_body_size 10G;
+        fastcgi_buffers 64 4K;
+
+        # Enable gzip but do not remove ETag headers
+        gzip on;
+        gzip_vary on;
+        gzip_comp_level 4;
+        gzip_min_length 256;
+        gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
+        gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+
+        # Uncomment if your server is build with the ngx_pagespeed module
+        # This module is currently not supported.
+        #pagespeed off;
+
+        location / {
+            rewrite ^ /index.php$uri;
+        }
+
+        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
+            deny all;
+        }
+        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
+            deny all;
+        }
+
+        location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) {
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
+            # fastcgi_param HTTPS on;
+            #Avoid sending the security headers twice
+            fastcgi_param modHeadersAvailable true;
+            fastcgi_param front_controller_active true;
+            fastcgi_pass php-handler;
+            fastcgi_intercept_errors on;
+            fastcgi_request_buffering off;
+        }
+
+        location ~ ^/(?:updater|ocs-provider)(?:$|/) {
+            try_files $uri/ =404;
+            index index.php;
+        }
+
+        # Adding the cache control header for js and css files
+        # Make sure it is BELOW the PHP block
+        location ~ \.(?:css|js|woff|svg|gif)$ {
+            try_files $uri /index.php$uri$is_args$args;
+            add_header Cache-Control "public, max-age=15778463";
+            # Add headers to serve security related headers (It is intended to
+            # have those duplicated to the ones above)
+            # Before enabling Strict-Transport-Security headers please read into
+            # this topic first.
+            # add_header Strict-Transport-Security "max-age=15768000;
+            #  includeSubDomains; preload;";
+            #
+            # WARNING: Only add the preload option once you read about
+            # the consequences in https://hstspreload.org/. This option
+            # will add the domain to a hardcoded list that is shipped
+            # in all major browsers and getting removed from this list
+            # could take several months.
+            add_header X-Content-Type-Options nosniff;
+            add_header X-XSS-Protection "1; mode=block";
+            add_header X-Robots-Tag none;
+            add_header X-Download-Options noopen;
+            add_header X-Permitted-Cross-Domain-Policies none;
+            # Optional: Don't log access to assets
+            access_log off;
+        }
+
+        location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
+            try_files $uri /index.php$uri$is_args$args;
+            # Optional: Don't log access to other assets
+            access_log off;
+        }
+    }
+
+}
+
diff --git a/roles/nextcloud-docker/tasks/main.yml b/roles/nextcloud-docker/tasks/main.yml
index 4b908a9..4f0762c 100644
--- a/roles/nextcloud-docker/tasks/main.yml
+++ b/roles/nextcloud-docker/tasks/main.yml
@@ -3,10 +3,10 @@
   copy:
     src: nextcloud
     dest: "{{docker_compose_files_folder}}"
-- name: Create nextcloud .env
+- name: Create db.env
   template:
-    src: nextcloud/.env
-    dest: "{{docker_compose_files_folder}}/nextcloud/.env"
+    src: nextcloud/db.env
+    dest: "{{docker_compose_files_folder}}/nextcloud/db.env"
 - name: Create nextcloud config
   template:
     src: nextcloud/config/config.php
@@ -33,4 +33,4 @@
   command: docker-compose exec -T db sh -c "mysql -u nextcloud -p{{nextcloud_mysql_password}} nextcloud < /backups/database.dmp"
   args:
     chdir: "{{docker_compose_files_folder}}/nextcloud/"
-  when: db_tables_exist.stdout_lines|length == 0
\ No newline at end of file
+  when: db_tables_exist.stdout_lines|length == 0
diff --git a/roles/nextcloud-docker/templates/nextcloud/config/config.php b/roles/nextcloud-docker/templates/nextcloud/config/config.php
index 24c25df..bf59ade 100644
--- a/roles/nextcloud-docker/templates/nextcloud/config/config.php
+++ b/roles/nextcloud-docker/templates/nextcloud/config/config.php
@@ -50,12 +50,4 @@ $CONFIG = array (
   'mail_smtpname' => 'noreply@banditlair.com',
   'mail_smtppassword' => '{{email_password}}',
   'filelocking.enabled' => true,
-  'memcache.locking' => '\\OC\\Memcache\\Redis',
-  'redis' => 
-  array (
-    'host' => 'redis',
-    'port' => 6379,
-    'timeout' => 0.0,
-    'password' => '',
-  ),
 );
diff --git a/roles/nextcloud-docker/templates/nextcloud/db.env b/roles/nextcloud-docker/templates/nextcloud/db.env
new file mode 100644
index 0000000..ad0d03a
--- /dev/null
+++ b/roles/nextcloud-docker/templates/nextcloud/db.env
@@ -0,0 +1,4 @@
+MYSQL_PASSWORD={{nextcloud_mysql_password}}
+MYSQL_DATABASE=nextcloud
+MYSQL_USER=nextcloud
+
diff --git a/roles/nginx-proxy-docker/files/proxy/docker-compose.yml b/roles/nginx-proxy-docker/files/proxy/docker-compose.yml
index d0b656b..07fe860 100644
--- a/roles/nginx-proxy-docker/files/proxy/docker-compose.yml
+++ b/roles/nginx-proxy-docker/files/proxy/docker-compose.yml
@@ -11,6 +11,8 @@ services:
     ports:
       - 80:80
       - 443:443
+    labels:
+      com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d
       - ./nginx/vhost.d:/etc/nginx/vhost.d