diff --git a/FILES/Apache2/cloud-site-name.conf.php-fpm b/FILES/Apache2/cloud-site-name.conf.php-fpm
index b44d4da..912963f 100644
--- a/FILES/Apache2/cloud-site-name.conf.php-fpm
+++ b/FILES/Apache2/cloud-site-name.conf.php-fpm
@@ -23,6 +23,17 @@
 
    ServerName <FULL-QUALIFIED-SITE-NAME>
 
+   # Service Discovery
+   #
+   # !! We alraedy provide this servis via '.htaccess'-file !!
+   #
+   # The redirects for CalDAV or CardDAV does not work if Nextcloud is running behind a
+   # reverse proxy. The recommended solution is that your reverse proxy does the redirects
+   #
+   #RewriteEngine On
+   #RewriteRule ^/\.well-known/carddav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+   #RewriteRule ^/\.well-known/caldav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+
    #ProxyErrorOverride On
 
    <FilesMatch \.php$>
diff --git a/FILES/images/favicon.ico b/FILES/images/favicon.ico
new file mode 100644
index 0000000..842fb7e
Binary files /dev/null and b/FILES/images/favicon.ico differ
diff --git a/install_nextcloud.sh b/install_nextcloud.sh
index 79c1f21..4cf974c 100755
--- a/install_nextcloud.sh
+++ b/install_nextcloud.sh
@@ -4594,6 +4594,17 @@ if $apache2_installed ; then
 
    ServerName ${WEBSITE}
 
+   # Service Discovery
+   #
+   # !! We alraedy provide this servis via '.htaccess'-file !!
+   #
+   # The redirects for CalDAV or CardDAV does not work if Nextcloud is running behind a
+   # reverse proxy. The recommended solution is that your reverse proxy does the redirects
+   #
+   #RewriteEngine On
+   #RewriteRule ^/\.well-known/carddav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+   #RewriteRule ^/\.well-known/caldav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+
    #ProxyErrorOverride On
 
    <FilesMatch \.php\$>
@@ -5152,6 +5163,25 @@ server {
       access_log off;     # Optional: Don't log access to assets
    }
 
+   # Service Discovery
+   #
+   # !! we already configured this service inside 'location ~ \.php(?:\$|/) {' !!
+   #
+   # The redirects for CalDAV or CardDAV does not work if Nextcloud is running behind a
+   # reverse proxy. The recommended solution is that your reverse proxy does the redirects
+   #
+   #rewrite ^/\.well-known/carddav https://\$server_name/remote.php/dav/ redirect;
+   #rewrite ^/\.well-known/caldav https://\$server_name/remote.php/dav/ redirect;
+   #
+   # or alternativ
+   #
+   #location /.well-known/carddav {
+   #   return 301 \$scheme://\$host/remote.php/dav;
+   #}
+   #location /.well-known/caldav {
+   #   return 301 \$scheme://\$host/remote.php/dav;
+   #}
+
    location / {
       try_files \$uri \$uri/ /index.php\$request_uri;
    }