diff --git a/webmails/Dockerfile b/webmails/Dockerfile
index b967af5a..8fd6f9f8 100644
--- a/webmails/Dockerfile
+++ b/webmails/Dockerfile
@@ -40,7 +40,7 @@ RUN set -euxo pipefail \
   ; mv carddav roundcube/plugins/ \
   ; cd roundcube \
   ; rm -rf CHANGELOG.md SECURITY.md INSTALL LICENSE README.md UPGRADING composer.json-dist installer composer.* \
-  ; ln -sf index.php /var/www/roundcube/sso.php \
+  ; ln -sf index.php /var/www/roundcube/public_html/sso.php \
   ; chmod -R u+w,a+rX /var/www/roundcube \
   ; chown -R nginx:nginx /var/www/roundcube \
   ; rm -rf plugins/{autologon,example_addressbook,http_authentication,krb_authentication,new_user_identity,password,redundant_attachments,squirrelmail_usercopy,userinfo,virtuser_file,virtuser_query}
diff --git a/webmails/nginx-webmail.conf b/webmails/nginx-webmail.conf
index b1149c49..37672ab1 100644
--- a/webmails/nginx-webmail.conf
+++ b/webmails/nginx-webmail.conf
@@ -2,7 +2,11 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server;
 
+{% if WEBMAIL == 'roundcube' %}
+    root /var/www/{{ WEBMAIL }}/public_html;
+{% else %}
     root /var/www/{{ WEBMAIL }};
+{% endif %}
 
     include /etc/nginx/mime.types;