diff --git a/docker/proxy/rootfs/etc/nginx/nginx.conf b/docker/proxy/rootfs/etc/nginx/nginx.conf
index 22caf419..7743e15e 100644
--- a/docker/proxy/rootfs/etc/nginx/nginx.conf
+++ b/docker/proxy/rootfs/etc/nginx/nginx.conf
@@ -1,301 +1,304 @@
 
 # For more information on configuration, see:
 #   * Official English Documentation: http://nginx.org/en/docs/
 #   * Official Russian Documentation: http://nginx.org/ru/docs/
 
 worker_processes auto;
 error_log stderr info;
 pid /run/nginx.pid;
 
 # Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
 include /usr/share/nginx/modules/*.conf;
 
 events {
     worker_connections 1024;
 }
 
 http {
     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  /dev/stdout  main;
 
     sendfile            on;
     tcp_nopush          on;
     tcp_nodelay         on;
     keepalive_timeout   65;
     types_hash_max_size 2048;
 
     include             /etc/nginx/mime.types;
     default_type        application/octet-stream;
 
     map $http_upgrade $connection_upgrade {
         default upgrade;
         '' close;
     }
 
     # Load modular configuration files from the /etc/nginx/conf.d directory.
     # See http://nginx.org/en/docs/ngx_core_module.html#include
     # for more information.
     include /etc/nginx/conf.d/*.conf;
 
     server {
         listen 6080;
         listen 6443 default_server ssl;
         listen [::]:6443 ssl ipv6only=on;
 
         ssl_certificate SSL_CERTIFICATE_CERT;
         ssl_certificate_key SSL_CERTIFICATE_KEY;
 
         server_name  APP_WEBSITE_DOMAIN;
         root         /usr/share/nginx/html;
 
         # Load configuration files for the default server block.
         include /etc/nginx/default.d/*.conf;
 
         location / {
             proxy_pass       WEBAPP_BACKEND;
             proxy_redirect   off;
             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-Host $host;
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_no_cache 1;
             proxy_cache_bypass 1;
             # Mostly for files, swoole has a 10MB limit
             client_max_body_size 11m;
         }
 
         location /meetmedia {
             proxy_pass MEET_BACKEND;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection $connection_upgrade;
             proxy_set_header Host $host;
         }
 
         location /meetmedia/api {
             proxy_pass MEET_BACKEND;
             proxy_redirect   off;
             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-Host $host;
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_no_cache 1;
             proxy_cache_bypass 1;
         }
 
         location WEBMAIL_PATH {
             proxy_pass       ROUNDCUBE_BACKEND;
             proxy_redirect   off;
             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-Host $host;
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_no_cache 1;
             proxy_cache_bypass 1;
         }
 
         location /chwala {
             proxy_pass       ROUNDCUBE_BACKEND;
             proxy_redirect   off;
             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-Host $host;
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_no_cache 1;
             proxy_cache_bypass 1;
         }
 
         location /Microsoft-Server-ActiveSync {
             auth_request     /auth;
             #auth_request_set $auth_status $upstream_status;
 
             proxy_pass       ROUNDCUBE_BACKEND;
             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_send_timeout 910s;
             proxy_read_timeout 910s;
             fastcgi_send_timeout 910s;
             fastcgi_read_timeout 910s;
         }
 
         location ~* ^/\\.well-known/autoconfig {
             proxy_pass       ROUNDCUBE_BACKEND;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
 
         location ~* ^/\\autodiscover/autodiscover.xml {
             proxy_pass       ROUNDCUBE_BACKEND;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
 
         location ~ ^/\\.well-known/(caldav|carddav)(.*)$ {
-            return 301 /dav/$2;
+            proxy_pass       ROUNDCUBE_BACKEND;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
 
         location /dav {
             #auth_request_set $auth_status $upstream_status;
 
             proxy_pass       DAV_BACKEND;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
 
         # static files
         location ^~ /browser {
             proxy_pass COLLABORA_BACKEND;
             proxy_set_header Host $http_host;
         }
 
         # WOPI discovery URL
         location ^~ /hosting/discovery {
             proxy_pass COLLABORA_BACKEND;
             proxy_set_header Host $http_host;
         }
 
         # Capabilities
         location ^~ /hosting/capabilities {
             proxy_pass COLLABORA_BACKEND;
             proxy_set_header Host $http_host;
         }
 
         # main websocket
         location ~ ^/cool/(.*)/ws$ {
             proxy_pass COLLABORA_BACKEND;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "Upgrade";
             proxy_set_header Host $http_host;
             proxy_read_timeout 36000s;
         }
 
         # download, presentation and image upload
         location ~ ^/(c|l)ool {
             proxy_pass COLLABORA_BACKEND;
             proxy_set_header Host $http_host;
         }
 
         # Admin Console websocket
         location ^~ /cool/adminws {
             proxy_pass COLLABORA_BACKEND;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "Upgrade";
             proxy_set_header Host $http_host;
             proxy_read_timeout 36000s;
         }
 
         location = /auth {
             internal;
             proxy_pass              WEBAPP_BACKEND/api/webhooks/nginx-httpauth;
             proxy_pass_request_body off;
             proxy_set_header        Host services.APP_WEBSITE_DOMAIN;
             proxy_set_header        Content-Length "";
             proxy_set_header        X-Original-URI $request_uri;
 
             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;
         }
 
         error_page 404 /404.html;
             location = /40x.html {
         }
 
         error_page 500 502 503 504 /50x.html;
             location = /50x.html {
         }
 
     }
 }
 
 mail {
     server_name         APP_WEBSITE_DOMAIN;
     auth_http           WEBAPP_BACKEND/api/webhooks/nginx;
     auth_http_header    Host services.APP_WEBSITE_DOMAIN;
 
     proxy_pass_error_message on;
     proxy_smtp_auth on;
     xclient off;
 
     server {
         listen 6143;
         protocol imap;
 
         proxy on;
         starttls on;
 
         ssl_certificate SSL_CERTIFICATE_CERT;
         ssl_certificate_key SSL_CERTIFICATE_KEY;
 
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers HIGH:!aNULL:!MD5;
     }
 
     # Roundcube specific imap endpoint with proxy-protocol enabled
     server {
         listen 6144 proxy_protocol;
         protocol imap;
 
         auth_http           WEBAPP_BACKEND/api/webhooks/nginx-roundcube;
 
         proxy on;
         starttls on;
 
         ssl_certificate SSL_CERTIFICATE_CERT;
         ssl_certificate_key SSL_CERTIFICATE_KEY;
 
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers HIGH:!aNULL:!MD5;
     }
 
     server {
         listen 6465 ssl;
         protocol smtp;
 
         proxy on;
 
         ssl_certificate SSL_CERTIFICATE_CERT;
         ssl_certificate_key SSL_CERTIFICATE_KEY;
 
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers HIGH:!aNULL:!MD5;
     }
 
     server {
         listen 6587;
         protocol smtp;
 
         proxy on;
         starttls on;
 
         ssl_certificate SSL_CERTIFICATE_CERT;
         ssl_certificate_key SSL_CERTIFICATE_KEY;
 
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers HIGH:!aNULL:!MD5;
     }
 
     server {
         listen 6993 ssl;
         protocol imap;
 
         proxy on;
 
         ssl_certificate SSL_CERTIFICATE_CERT;
         ssl_certificate_key SSL_CERTIFICATE_KEY;
 
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers HIGH:!aNULL:!MD5;
     }
 }
diff --git a/docker/roundcube/rootfs/etc/httpd/conf.d/well-known.conf b/docker/roundcube/rootfs/etc/httpd/conf.d/well-known.conf
index dca5fcc7..43d4a782 100644
--- a/docker/roundcube/rootfs/etc/httpd/conf.d/well-known.conf
+++ b/docker/roundcube/rootfs/etc/httpd/conf.d/well-known.conf
@@ -1,2 +1,4 @@
-Redirect 301 /.well-known/caldav /dav/
-Redirect 301 /.well-known/carddav /dav/
+
+RewriteEngine On
+RewriteCond %{REQUEST_URI} (/.well-known/caldav|/.well-known/carddav)
+RewriteRule /.well-known/caldav(.*) https://%{HTTP_HOST}/dav$1 [R=301,L]