diff --git a/charts/collabora/2.0.3/.helmignore b/charts/collabora/2.0.4/.helmignore
similarity index 100%
rename from charts/collabora/2.0.3/.helmignore
rename to charts/collabora/2.0.4/.helmignore
diff --git a/charts/collabora/2.0.3/Chart.lock b/charts/collabora/2.0.4/Chart.lock
similarity index 100%
rename from charts/collabora/2.0.3/Chart.lock
rename to charts/collabora/2.0.4/Chart.lock
diff --git a/charts/collabora/2.0.3/Chart.yaml b/charts/collabora/2.0.4/Chart.yaml
similarity index 97%
rename from charts/collabora/2.0.3/Chart.yaml
rename to charts/collabora/2.0.4/Chart.yaml
index 18eef91e0b..80c7d85e6c 100644
--- a/charts/collabora/2.0.3/Chart.yaml
+++ b/charts/collabora/2.0.4/Chart.yaml
@@ -4,7 +4,7 @@ description: Collabora is a collaborative online office suite based on LibreOffi
 annotations:
   title: Collabora
 type: application
-version: 2.0.3
+version: 2.0.4
 apiVersion: v2
 appVersion: 23.05.8.4.1
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/collabora/2.0.3/README.md b/charts/collabora/2.0.4/README.md
similarity index 100%
rename from charts/collabora/2.0.3/README.md
rename to charts/collabora/2.0.4/README.md
diff --git a/charts/collabora/2.0.3/app-readme.md b/charts/collabora/2.0.4/app-readme.md
similarity index 100%
rename from charts/collabora/2.0.3/app-readme.md
rename to charts/collabora/2.0.4/app-readme.md
diff --git a/charts/collabora/2.0.3/charts/common-1.2.9.tgz b/charts/collabora/2.0.4/charts/common-1.2.9.tgz
similarity index 100%
rename from charts/collabora/2.0.3/charts/common-1.2.9.tgz
rename to charts/collabora/2.0.4/charts/common-1.2.9.tgz
diff --git a/charts/collabora/2.0.3/ci/basic-values.yaml b/charts/collabora/2.0.4/ci/basic-values.yaml
similarity index 100%
rename from charts/collabora/2.0.3/ci/basic-values.yaml
rename to charts/collabora/2.0.4/ci/basic-values.yaml
diff --git a/charts/collabora/2.0.3/ci/https-values.yaml b/charts/collabora/2.0.4/ci/https-values.yaml
similarity index 100%
rename from charts/collabora/2.0.3/ci/https-values.yaml
rename to charts/collabora/2.0.4/ci/https-values.yaml
diff --git a/charts/collabora/2.0.4/ci/noauth-values.yaml b/charts/collabora/2.0.4/ci/noauth-values.yaml
new file mode 100644
index 0000000000..d7ee3ff9cd
--- /dev/null
+++ b/charts/collabora/2.0.4/ci/noauth-values.yaml
@@ -0,0 +1,17 @@
+collaboraConfig:
+  enableWebUI: false
+  username: ''
+  password: ''
+  dictionaries:
+    - en_GB
+    - en_US
+  aliasGroup1:
+    - nc.example.com
+    - other-nc.example.com
+  serverName: collabora.example.com:9980
+  extraParams:
+    - --o:welcome.enable=false
+    - --o:user_interface.mode=notebookbar
+    - --o:ssl.termination=true
+    - --o:ssl.enable=false
+    - --o:net.proto=IPv4
diff --git a/charts/collabora/2.0.3/ix_values.yaml b/charts/collabora/2.0.4/ix_values.yaml
similarity index 100%
rename from charts/collabora/2.0.3/ix_values.yaml
rename to charts/collabora/2.0.4/ix_values.yaml
diff --git a/charts/collabora/2.0.3/metadata.yaml b/charts/collabora/2.0.4/metadata.yaml
similarity index 100%
rename from charts/collabora/2.0.3/metadata.yaml
rename to charts/collabora/2.0.4/metadata.yaml
diff --git a/charts/collabora/2.0.3/migrations/migrate b/charts/collabora/2.0.4/migrations/migrate
similarity index 100%
rename from charts/collabora/2.0.3/migrations/migrate
rename to charts/collabora/2.0.4/migrations/migrate
diff --git a/charts/collabora/2.0.3/questions.yaml b/charts/collabora/2.0.4/questions.yaml
similarity index 99%
rename from charts/collabora/2.0.3/questions.yaml
rename to charts/collabora/2.0.4/questions.yaml
index f0727f41a9..05d4cb0c3b 100644
--- a/charts/collabora/2.0.3/questions.yaml
+++ b/charts/collabora/2.0.4/questions.yaml
@@ -49,9 +49,9 @@ questions:
           label: Username for WebUI
           schema:
             type: string
+            required: true
             show_if: [[enableWebUI, "=", true]]
             default: ""
-            required: true
         - variable: password
           label: Password for WebUI
           schema:
@@ -60,7 +60,7 @@ questions:
             private: true
             required: true
             show_if: [[enableWebUI, "=", true]]
-            valid_chars: "[a-zA-Z0-9!@#%^&*?]{8,}"
+            valid_chars: "^[a-zA-Z0-9!@#%^&*?]{8,}$|^$"
             valid_chars_error: |
               Password must be at least 8 characters long and contain at least one of the following:</br>
               - Uppercase letter</br>
diff --git a/charts/collabora/2.0.3/templates/NOTES.txt b/charts/collabora/2.0.4/templates/NOTES.txt
similarity index 100%
rename from charts/collabora/2.0.3/templates/NOTES.txt
rename to charts/collabora/2.0.4/templates/NOTES.txt
diff --git a/charts/collabora/2.0.3/templates/_collabora.tpl b/charts/collabora/2.0.4/templates/_collabora.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_collabora.tpl
rename to charts/collabora/2.0.4/templates/_collabora.tpl
diff --git a/charts/collabora/2.0.3/templates/_configuration.tpl b/charts/collabora/2.0.4/templates/_configuration.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_configuration.tpl
rename to charts/collabora/2.0.4/templates/_configuration.tpl
diff --git a/charts/collabora/2.0.3/templates/_migration.tpl b/charts/collabora/2.0.4/templates/_migration.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_migration.tpl
rename to charts/collabora/2.0.4/templates/_migration.tpl
diff --git a/charts/collabora/2.0.3/templates/_nginx.tpl b/charts/collabora/2.0.4/templates/_nginx.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_nginx.tpl
rename to charts/collabora/2.0.4/templates/_nginx.tpl
diff --git a/charts/collabora/2.0.3/templates/_persistance.tpl b/charts/collabora/2.0.4/templates/_persistance.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_persistance.tpl
rename to charts/collabora/2.0.4/templates/_persistance.tpl
diff --git a/charts/collabora/2.0.3/templates/_portal.tpl b/charts/collabora/2.0.4/templates/_portal.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_portal.tpl
rename to charts/collabora/2.0.4/templates/_portal.tpl
diff --git a/charts/collabora/2.0.3/templates/_service.tpl b/charts/collabora/2.0.4/templates/_service.tpl
similarity index 100%
rename from charts/collabora/2.0.3/templates/_service.tpl
rename to charts/collabora/2.0.4/templates/_service.tpl
diff --git a/charts/collabora/2.0.3/templates/common.yaml b/charts/collabora/2.0.4/templates/common.yaml
similarity index 100%
rename from charts/collabora/2.0.3/templates/common.yaml
rename to charts/collabora/2.0.4/templates/common.yaml
diff --git a/charts/collabora/2.0.3/to_keep_versions.md b/charts/collabora/2.0.4/to_keep_versions.md
similarity index 100%
rename from charts/collabora/2.0.3/to_keep_versions.md
rename to charts/collabora/2.0.4/to_keep_versions.md
diff --git a/charts/pihole/1.0.24/.helmignore b/charts/pihole/1.0.25/.helmignore
similarity index 100%
rename from charts/pihole/1.0.24/.helmignore
rename to charts/pihole/1.0.25/.helmignore
diff --git a/charts/pihole/1.0.24/Chart.lock b/charts/pihole/1.0.25/Chart.lock
similarity index 100%
rename from charts/pihole/1.0.24/Chart.lock
rename to charts/pihole/1.0.25/Chart.lock
diff --git a/charts/pihole/1.0.24/Chart.yaml b/charts/pihole/1.0.25/Chart.yaml
similarity index 97%
rename from charts/pihole/1.0.24/Chart.yaml
rename to charts/pihole/1.0.25/Chart.yaml
index 252da8716b..cc6f5f4026 100644
--- a/charts/pihole/1.0.24/Chart.yaml
+++ b/charts/pihole/1.0.25/Chart.yaml
@@ -3,7 +3,7 @@ description: DNS and Ad-filtering for your network.
 annotations:
   title: Pi-hole
 type: application
-version: 1.0.24
+version: 1.0.25
 apiVersion: v2
 appVersion: 2023.11.0
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/pihole/1.0.24/README.md b/charts/pihole/1.0.25/README.md
similarity index 100%
rename from charts/pihole/1.0.24/README.md
rename to charts/pihole/1.0.25/README.md
diff --git a/charts/pihole/1.0.24/app-readme.md b/charts/pihole/1.0.25/app-readme.md
similarity index 100%
rename from charts/pihole/1.0.24/app-readme.md
rename to charts/pihole/1.0.25/app-readme.md
diff --git a/charts/pihole/1.0.24/charts/common-2304.0.1.tgz b/charts/pihole/1.0.25/charts/common-2304.0.1.tgz
similarity index 100%
rename from charts/pihole/1.0.24/charts/common-2304.0.1.tgz
rename to charts/pihole/1.0.25/charts/common-2304.0.1.tgz
diff --git a/charts/pihole/1.0.24/ci/hostnet-values.yaml b/charts/pihole/1.0.25/ci/hostnet-values.yaml
similarity index 100%
rename from charts/pihole/1.0.24/ci/hostnet-values.yaml
rename to charts/pihole/1.0.25/ci/hostnet-values.yaml
diff --git a/charts/pihole/1.0.24/ci/test-values.yaml b/charts/pihole/1.0.25/ci/test-values.yaml
similarity index 100%
rename from charts/pihole/1.0.24/ci/test-values.yaml
rename to charts/pihole/1.0.25/ci/test-values.yaml
diff --git a/charts/pihole/1.0.24/ix_values.yaml b/charts/pihole/1.0.25/ix_values.yaml
similarity index 100%
rename from charts/pihole/1.0.24/ix_values.yaml
rename to charts/pihole/1.0.25/ix_values.yaml
diff --git a/charts/pihole/1.0.24/metadata.yaml b/charts/pihole/1.0.25/metadata.yaml
similarity index 100%
rename from charts/pihole/1.0.24/metadata.yaml
rename to charts/pihole/1.0.25/metadata.yaml
diff --git a/charts/pihole/1.0.24/questions.yaml b/charts/pihole/1.0.25/questions.yaml
similarity index 100%
rename from charts/pihole/1.0.24/questions.yaml
rename to charts/pihole/1.0.25/questions.yaml
diff --git a/charts/pihole/1.0.24/templates/deployment.yaml b/charts/pihole/1.0.25/templates/deployment.yaml
similarity index 98%
rename from charts/pihole/1.0.24/templates/deployment.yaml
rename to charts/pihole/1.0.25/templates/deployment.yaml
index df45d62475..09635f83d8 100644
--- a/charts/pihole/1.0.24/templates/deployment.yaml
+++ b/charts/pihole/1.0.25/templates/deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-pihole
   labels:
     app: {{ template "common.names.name" . }}
     chart: {{ template "common.names.chart" . }}
diff --git a/charts/pihole/1.0.24/templates/pre-install-job.yaml b/charts/pihole/1.0.25/templates/pre-install-job.yaml
similarity index 100%
rename from charts/pihole/1.0.24/templates/pre-install-job.yaml
rename to charts/pihole/1.0.25/templates/pre-install-job.yaml
diff --git a/charts/pihole/1.0.24/templates/secret.yaml b/charts/pihole/1.0.25/templates/secret.yaml
similarity index 100%
rename from charts/pihole/1.0.24/templates/secret.yaml
rename to charts/pihole/1.0.25/templates/secret.yaml