diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index a740180749b..97bca6e53e6 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -29,7 +29,7 @@ sources:
   - https://github.com/nextcloud/docker
   - https://github.com/nextcloud/helm
 type: application
-version: 21.0.5
+version: 21.0.6
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/stable/nextcloud/templates/_configmap.tpl b/charts/stable/nextcloud/templates/_configmap.tpl
index 527df08a216..3c1bf37005a 100644
--- a/charts/stable/nextcloud/templates/_configmap.tpl
+++ b/charts/stable/nextcloud/templates/_configmap.tpl
@@ -340,11 +340,6 @@ nginx-config:
             location = /.well-known/carddav { return 301 /remote.php/dav/; }
             location = /.well-known/caldav  { return 301 /remote.php/dav/; }
 
-            # According to the documentation these two lines are not necessary,
-            # but some users are still receiving errors
-            location = /.well-known/webfinger   { return 301 /index.php$uri; }
-            location = /.well-known/nodeinfo   { return 301 /index.php$uri; }
-
             location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
             location /.well-known/pki-validation    { try_files $uri $uri/ =404; }