diff --git a/charts/nextcloud/1.6.40/templates/NOTES.txt b/charts/nextcloud/1.6.40/templates/NOTES.txt
deleted file mode 100644
index 9b2f7cd2d1..0000000000
--- a/charts/nextcloud/1.6.40/templates/NOTES.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1. Get the nextcloud URL by running:
-
-  echo http://{{ .Values.nextcloud.host }}:{{ .Values.service.nodePort }}/
diff --git a/charts/nextcloud/1.6.40/templates/postgres-secret.yaml b/charts/nextcloud/1.6.40/templates/postgres-secret.yaml
deleted file mode 100644
index 2ebc8b9b17..0000000000
--- a/charts/nextcloud/1.6.40/templates/postgres-secret.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-{{- $secretName := "db-details" }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ $secretName }}
-data:
-  {{/*
-  Lookup for the user shouldn't be needed in normal circumstances
-  But there was a typo before that resulted to a db-user with weird
-  characters. So to keep that user for existing installations we retrieve
-  it from the existing secret.
-  */}}
-  {{ with (lookup "v1" "Secret" .Release.Namespace $secretName)}}
-  db-user: {{ index .data "db-user" }}
-  {{ else }}
-  db-user: {{ (include "postgres.DatabaseName" .Values ) | b64enc }}
-  {{ end }}
-  {{ with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
-  db-password: {{ index .data "db-password" }}
-  {{ else }}
-  db-password: {{ randAlphaNum 15 | b64enc }}
-  {{ end }}
diff --git a/charts/nextcloud/1.6.40/.helmignore b/charts/nextcloud/1.6.41/.helmignore
similarity index 100%
rename from charts/nextcloud/1.6.40/.helmignore
rename to charts/nextcloud/1.6.41/.helmignore
diff --git a/charts/nextcloud/1.6.40/Chart.lock b/charts/nextcloud/1.6.41/Chart.lock
similarity index 100%
rename from charts/nextcloud/1.6.40/Chart.lock
rename to charts/nextcloud/1.6.41/Chart.lock
diff --git a/charts/nextcloud/1.6.40/Chart.yaml b/charts/nextcloud/1.6.41/Chart.yaml
similarity index 98%
rename from charts/nextcloud/1.6.40/Chart.yaml
rename to charts/nextcloud/1.6.41/Chart.yaml
index 3ce399ff91..5a7e9ddcbe 100644
--- a/charts/nextcloud/1.6.40/Chart.yaml
+++ b/charts/nextcloud/1.6.41/Chart.yaml
@@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow
 annotations:
   title: Nextcloud
 type: application
-version: 1.6.40
+version: 1.6.41
 apiVersion: v2
 appVersion: 27.0.2
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/nextcloud/1.6.40/README.md b/charts/nextcloud/1.6.41/README.md
similarity index 100%
rename from charts/nextcloud/1.6.40/README.md
rename to charts/nextcloud/1.6.41/README.md
diff --git a/charts/nextcloud/1.6.40/app-readme.md b/charts/nextcloud/1.6.41/app-readme.md
similarity index 100%
rename from charts/nextcloud/1.6.40/app-readme.md
rename to charts/nextcloud/1.6.41/app-readme.md
diff --git a/charts/nextcloud/1.6.40/charts/common-2304.0.1.tgz b/charts/nextcloud/1.6.41/charts/common-2304.0.1.tgz
similarity index 100%
rename from charts/nextcloud/1.6.40/charts/common-2304.0.1.tgz
rename to charts/nextcloud/1.6.41/charts/common-2304.0.1.tgz
diff --git a/charts/nextcloud/1.6.40/ci/test-values.yaml b/charts/nextcloud/1.6.41/ci/test-values.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/ci/test-values.yaml
rename to charts/nextcloud/1.6.41/ci/test-values.yaml
diff --git a/charts/nextcloud/1.6.40/ix_values.yaml b/charts/nextcloud/1.6.41/ix_values.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/ix_values.yaml
rename to charts/nextcloud/1.6.41/ix_values.yaml
diff --git a/charts/nextcloud/1.6.40/metadata.yaml b/charts/nextcloud/1.6.41/metadata.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/metadata.yaml
rename to charts/nextcloud/1.6.41/metadata.yaml
diff --git a/charts/nextcloud/1.6.40/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.41/migrations/migrate_from_1.1.0
similarity index 100%
rename from charts/nextcloud/1.6.40/migrations/migrate_from_1.1.0
rename to charts/nextcloud/1.6.41/migrations/migrate_from_1.1.0
diff --git a/charts/nextcloud/1.6.40/questions.yaml b/charts/nextcloud/1.6.41/questions.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/questions.yaml
rename to charts/nextcloud/1.6.41/questions.yaml
diff --git a/charts/nextcloud/1.6.41/templates/NOTES.txt b/charts/nextcloud/1.6.41/templates/NOTES.txt
new file mode 100644
index 0000000000..6ad5448619
--- /dev/null
+++ b/charts/nextcloud/1.6.41/templates/NOTES.txt
@@ -0,0 +1,16 @@
+## Database
+You can connect to the database using the pgAdmin App from the catalog
+
+<details>
+  <summary>Database Details</summary>
+
+  - Database: `nextcloud`
+  - Username: `{{ .Values.nextcloudDbUser | b64dec }}`
+  - Password: `{{ .Values.nextcloudDbPass | b64dec }}`
+  - Host:     `{{ .Values.nextcloudDbHost }}.{{ .Release.Namespace }}.svc.cluster.local`
+  - Port:     `5432`
+
+</details>
+{{- $_ := unset .Values "nextcloudDbUser" }}
+{{- $_ := unset .Values "nextcloudDbPass" }}
+{{- $_ := unset .Values "nextcloudDbHost" }}
diff --git a/charts/nextcloud/1.6.40/templates/_nginx.tpl b/charts/nextcloud/1.6.41/templates/_nginx.tpl
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/_nginx.tpl
rename to charts/nextcloud/1.6.41/templates/_nginx.tpl
diff --git a/charts/nextcloud/1.6.40/templates/_postgres.tpl b/charts/nextcloud/1.6.41/templates/_postgres.tpl
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/_postgres.tpl
rename to charts/nextcloud/1.6.41/templates/_postgres.tpl
diff --git a/charts/nextcloud/1.6.40/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.41/templates/backup-postgres-config.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/backup-postgres-config.yaml
rename to charts/nextcloud/1.6.41/templates/backup-postgres-config.yaml
diff --git a/charts/nextcloud/1.6.40/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.41/templates/backup-postgres-hook.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/backup-postgres-hook.yaml
rename to charts/nextcloud/1.6.41/templates/backup-postgres-hook.yaml
diff --git a/charts/nextcloud/1.6.40/templates/cronjob.yaml b/charts/nextcloud/1.6.41/templates/cronjob.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/cronjob.yaml
rename to charts/nextcloud/1.6.41/templates/cronjob.yaml
diff --git a/charts/nextcloud/1.6.40/templates/deployment.yaml b/charts/nextcloud/1.6.41/templates/deployment.yaml
similarity index 98%
rename from charts/nextcloud/1.6.40/templates/deployment.yaml
rename to charts/nextcloud/1.6.41/templates/deployment.yaml
index 7e970fc30d..41451a1ab3 100644
--- a/charts/nextcloud/1.6.40/templates/deployment.yaml
+++ b/charts/nextcloud/1.6.41/templates/deployment.yaml
@@ -74,6 +74,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }}
         {{ $secretName := (include "common.names.fullname" .) }}
         {{ $envList := (default list .Values.environmentVariables) }}
+        {{- $_ := set .Values "nextcloudDbHost" (include "common.names.fullname" $postgres_values) -}} {{/* Temprary store it on values to display it on NOTES */}}
         {{ $envList = mustAppend $envList (dict "name" "POSTGRES_HOST" "value" (printf "%s:5432" (include "common.names.fullname" $postgres_values))) }}
         {{ $envList = mustAppend $envList (dict "name" "POSTGRES_DB" "value" (include "postgres.DatabaseName" .)) }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_DATA_DIR" "value" .Values.nextcloud.datadir) }}
diff --git a/charts/nextcloud/1.6.40/templates/nextcloud-configmap.yaml b/charts/nextcloud/1.6.41/templates/nextcloud-configmap.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/nextcloud-configmap.yaml
rename to charts/nextcloud/1.6.41/templates/nextcloud-configmap.yaml
diff --git a/charts/nextcloud/1.6.40/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.41/templates/nginx-configmap.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/nginx-configmap.yaml
rename to charts/nextcloud/1.6.41/templates/nginx-configmap.yaml
diff --git a/charts/nextcloud/1.6.40/templates/nginx-secret.yaml b/charts/nextcloud/1.6.41/templates/nginx-secret.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/nginx-secret.yaml
rename to charts/nextcloud/1.6.41/templates/nginx-secret.yaml
diff --git a/charts/nextcloud/1.6.40/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.41/templates/nuke-deployments-hook.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/nuke-deployments-hook.yaml
rename to charts/nextcloud/1.6.41/templates/nuke-deployments-hook.yaml
diff --git a/charts/nextcloud/1.6.40/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.41/templates/postgres-deployment.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/postgres-deployment.yaml
rename to charts/nextcloud/1.6.41/templates/postgres-deployment.yaml
diff --git a/charts/nextcloud/1.6.41/templates/postgres-secret.yaml b/charts/nextcloud/1.6.41/templates/postgres-secret.yaml
new file mode 100644
index 0000000000..6c265ba0e6
--- /dev/null
+++ b/charts/nextcloud/1.6.41/templates/postgres-secret.yaml
@@ -0,0 +1,26 @@
+{{- $secretName := "db-details" }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $secretName }}
+data:
+  {{/*
+  Lookup for the user shouldn't be needed in normal circumstances
+  But there was a typo before that resulted to a db-user with weird
+  characters. So to keep that user for existing installations we retrieve
+  it from the existing secret.
+  */}}
+  {{/* Init values */}}
+  {{- $dbUser := ((include "postgres.DatabaseName" .Values) | b64enc) -}}
+  {{- $dbPass := (randAlphaNum 15 | b64enc) -}}
+  {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+    {{/* If there is a previous secret, use that */}}
+    {{- $dbUser = (index .data "db-user") -}}
+    {{- $dbPass = (index .data "db-password") -}}
+  {{- end }}
+  db-user: {{ $dbUser }}
+  db-password: {{ $dbPass }}
+
+{{/* Temprary store them on values to display it on NOTES */}}
+{{ $_ := set .Values "nextcloudDbPass" $dbPass }}
+{{ $_ := set .Values "nextcloudDbUser" $dbUser }}
diff --git a/charts/nextcloud/1.6.40/templates/postgres-service.yaml b/charts/nextcloud/1.6.41/templates/postgres-service.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/postgres-service.yaml
rename to charts/nextcloud/1.6.41/templates/postgres-service.yaml
diff --git a/charts/nextcloud/1.6.40/templates/secrets.yaml b/charts/nextcloud/1.6.41/templates/secrets.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/secrets.yaml
rename to charts/nextcloud/1.6.41/templates/secrets.yaml
diff --git a/charts/nextcloud/1.6.40/templates/service.yaml b/charts/nextcloud/1.6.41/templates/service.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/service.yaml
rename to charts/nextcloud/1.6.41/templates/service.yaml
diff --git a/charts/nextcloud/1.6.40/templates/serviceaccount.yaml b/charts/nextcloud/1.6.41/templates/serviceaccount.yaml
similarity index 100%
rename from charts/nextcloud/1.6.40/templates/serviceaccount.yaml
rename to charts/nextcloud/1.6.41/templates/serviceaccount.yaml