diff --git a/charts/nextcloud/2.0.4/.helmignore b/charts/nextcloud/2.0.5/.helmignore
similarity index 100%
rename from charts/nextcloud/2.0.4/.helmignore
rename to charts/nextcloud/2.0.5/.helmignore
diff --git a/charts/nextcloud/2.0.4/Chart.lock b/charts/nextcloud/2.0.5/Chart.lock
similarity index 100%
rename from charts/nextcloud/2.0.4/Chart.lock
rename to charts/nextcloud/2.0.5/Chart.lock
diff --git a/charts/nextcloud/2.0.4/Chart.yaml b/charts/nextcloud/2.0.5/Chart.yaml
similarity index 97%
rename from charts/nextcloud/2.0.4/Chart.yaml
rename to charts/nextcloud/2.0.5/Chart.yaml
index daadeb3ccd..eb3dda8dd7 100644
--- a/charts/nextcloud/2.0.4/Chart.yaml
+++ b/charts/nextcloud/2.0.5/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: 2.0.4
+version: 2.0.5
 apiVersion: v2
 appVersion: 29.0.0
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/nextcloud/2.0.4/README.md b/charts/nextcloud/2.0.5/README.md
similarity index 100%
rename from charts/nextcloud/2.0.4/README.md
rename to charts/nextcloud/2.0.5/README.md
diff --git a/charts/nextcloud/2.0.4/app-readme.md b/charts/nextcloud/2.0.5/app-readme.md
similarity index 100%
rename from charts/nextcloud/2.0.4/app-readme.md
rename to charts/nextcloud/2.0.5/app-readme.md
diff --git a/charts/nextcloud/2.0.4/charts/common-1.2.9.tgz b/charts/nextcloud/2.0.5/charts/common-1.2.9.tgz
similarity index 100%
rename from charts/nextcloud/2.0.4/charts/common-1.2.9.tgz
rename to charts/nextcloud/2.0.5/charts/common-1.2.9.tgz
diff --git a/charts/nextcloud/2.0.4/ci/basic-values.yaml b/charts/nextcloud/2.0.5/ci/basic-values.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/ci/basic-values.yaml
rename to charts/nextcloud/2.0.5/ci/basic-values.yaml
diff --git a/charts/nextcloud/2.0.4/ci/https-values.yaml b/charts/nextcloud/2.0.5/ci/https-values.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/ci/https-values.yaml
rename to charts/nextcloud/2.0.5/ci/https-values.yaml
diff --git a/charts/nextcloud/2.0.4/ci/no-cron.yaml b/charts/nextcloud/2.0.5/ci/no-cron.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/ci/no-cron.yaml
rename to charts/nextcloud/2.0.5/ci/no-cron.yaml
diff --git a/charts/nextcloud/2.0.4/ci/nocmd-values.yaml b/charts/nextcloud/2.0.5/ci/nocmd-values.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/ci/nocmd-values.yaml
rename to charts/nextcloud/2.0.5/ci/nocmd-values.yaml
diff --git a/charts/nextcloud/2.0.4/ci/onedata-values.yaml b/charts/nextcloud/2.0.5/ci/onedata-values.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/ci/onedata-values.yaml
rename to charts/nextcloud/2.0.5/ci/onedata-values.yaml
diff --git a/charts/nextcloud/2.0.4/ix_values.yaml b/charts/nextcloud/2.0.5/ix_values.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/ix_values.yaml
rename to charts/nextcloud/2.0.5/ix_values.yaml
diff --git a/charts/nextcloud/2.0.4/metadata.yaml b/charts/nextcloud/2.0.5/metadata.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/metadata.yaml
rename to charts/nextcloud/2.0.5/metadata.yaml
diff --git a/charts/nextcloud/2.0.4/migrations/migrate b/charts/nextcloud/2.0.5/migrations/migrate
similarity index 100%
rename from charts/nextcloud/2.0.4/migrations/migrate
rename to charts/nextcloud/2.0.5/migrations/migrate
diff --git a/charts/nextcloud/2.0.4/questions.yaml b/charts/nextcloud/2.0.5/questions.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/questions.yaml
rename to charts/nextcloud/2.0.5/questions.yaml
diff --git a/charts/nextcloud/2.0.4/templates/NOTES.txt b/charts/nextcloud/2.0.5/templates/NOTES.txt
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/NOTES.txt
rename to charts/nextcloud/2.0.5/templates/NOTES.txt
diff --git a/charts/nextcloud/2.0.4/templates/_configuration.tpl b/charts/nextcloud/2.0.5/templates/_configuration.tpl
similarity index 98%
rename from charts/nextcloud/2.0.4/templates/_configuration.tpl
rename to charts/nextcloud/2.0.5/templates/_configuration.tpl
index 82955f0c68..48575e2a77 100644
--- a/charts/nextcloud/2.0.4/templates/_configuration.tpl
+++ b/charts/nextcloud/2.0.5/templates/_configuration.tpl
@@ -71,8 +71,8 @@ secret:
         {{- end -}}
       {{- end }}
       NEXTCLOUD_TRUSTED_DOMAINS: {{ list $host "127.0.0.1" "localhost" (printf "%v-*" $fullname) $fullname | mustUniq | join " " | quote }}
-      NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser }}
-      NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword }}
+      NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser | quote }}
+      NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword | quote }}
     {{- if .Values.ncNetwork.certificateID }}
       {{- $svcCidr := "" -}}
       {{- $clusterCidr := "" -}}
diff --git a/charts/nextcloud/2.0.4/templates/_cron.tpl b/charts/nextcloud/2.0.5/templates/_cron.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_cron.tpl
rename to charts/nextcloud/2.0.5/templates/_cron.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_migration.tpl b/charts/nextcloud/2.0.5/templates/_migration.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_migration.tpl
rename to charts/nextcloud/2.0.5/templates/_migration.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_nextcloud-configs.tpl b/charts/nextcloud/2.0.5/templates/_nextcloud-configs.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_nextcloud-configs.tpl
rename to charts/nextcloud/2.0.5/templates/_nextcloud-configs.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_nextcloud.tpl b/charts/nextcloud/2.0.5/templates/_nextcloud.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_nextcloud.tpl
rename to charts/nextcloud/2.0.5/templates/_nextcloud.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_nginx-configuration.tpl b/charts/nextcloud/2.0.5/templates/_nginx-configuration.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_nginx-configuration.tpl
rename to charts/nextcloud/2.0.5/templates/_nginx-configuration.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_nginx.tpl b/charts/nextcloud/2.0.5/templates/_nginx.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_nginx.tpl
rename to charts/nextcloud/2.0.5/templates/_nginx.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_persistence.tpl b/charts/nextcloud/2.0.5/templates/_persistence.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_persistence.tpl
rename to charts/nextcloud/2.0.5/templates/_persistence.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_portal.tpl b/charts/nextcloud/2.0.5/templates/_portal.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_portal.tpl
rename to charts/nextcloud/2.0.5/templates/_portal.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_postgres.tpl b/charts/nextcloud/2.0.5/templates/_postgres.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_postgres.tpl
rename to charts/nextcloud/2.0.5/templates/_postgres.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_redis.tpl b/charts/nextcloud/2.0.5/templates/_redis.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_redis.tpl
rename to charts/nextcloud/2.0.5/templates/_redis.tpl
diff --git a/charts/nextcloud/2.0.4/templates/_service.tpl b/charts/nextcloud/2.0.5/templates/_service.tpl
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/_service.tpl
rename to charts/nextcloud/2.0.5/templates/_service.tpl
diff --git a/charts/nextcloud/2.0.4/templates/common.yaml b/charts/nextcloud/2.0.5/templates/common.yaml
similarity index 100%
rename from charts/nextcloud/2.0.4/templates/common.yaml
rename to charts/nextcloud/2.0.5/templates/common.yaml
diff --git a/charts/nextcloud/2.0.4/to_keep_versions.md b/charts/nextcloud/2.0.5/to_keep_versions.md
similarity index 100%
rename from charts/nextcloud/2.0.4/to_keep_versions.md
rename to charts/nextcloud/2.0.5/to_keep_versions.md