diff --git a/charts/collabora/1.2.17/.helmignore b/charts/collabora/1.2.18/.helmignore
similarity index 100%
rename from charts/collabora/1.2.17/.helmignore
rename to charts/collabora/1.2.18/.helmignore
diff --git a/charts/collabora/1.2.17/Chart.lock b/charts/collabora/1.2.18/Chart.lock
similarity index 100%
rename from charts/collabora/1.2.17/Chart.lock
rename to charts/collabora/1.2.18/Chart.lock
diff --git a/charts/collabora/1.2.17/Chart.yaml b/charts/collabora/1.2.18/Chart.yaml
similarity index 97%
rename from charts/collabora/1.2.17/Chart.yaml
rename to charts/collabora/1.2.18/Chart.yaml
index ac8e3f9e53..de75e3a99d 100644
--- a/charts/collabora/1.2.17/Chart.yaml
+++ b/charts/collabora/1.2.18/Chart.yaml
@@ -5,7 +5,7 @@ description: |
 annotations:
   title: Collabora
 type: application
-version: 1.2.17
+version: 1.2.18
 apiVersion: v2
 appVersion: 23.05.4.2.1
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/collabora/1.2.17/README.md b/charts/collabora/1.2.18/README.md
similarity index 100%
rename from charts/collabora/1.2.17/README.md
rename to charts/collabora/1.2.18/README.md
diff --git a/charts/collabora/1.2.17/app-readme.md b/charts/collabora/1.2.18/app-readme.md
similarity index 100%
rename from charts/collabora/1.2.17/app-readme.md
rename to charts/collabora/1.2.18/app-readme.md
diff --git a/charts/collabora/1.2.17/charts/common-2304.0.1.tgz b/charts/collabora/1.2.18/charts/common-2304.0.1.tgz
similarity index 100%
rename from charts/collabora/1.2.17/charts/common-2304.0.1.tgz
rename to charts/collabora/1.2.18/charts/common-2304.0.1.tgz
diff --git a/charts/collabora/1.2.17/ci/http-values.yaml b/charts/collabora/1.2.18/ci/http-values.yaml
similarity index 89%
rename from charts/collabora/1.2.17/ci/http-values.yaml
rename to charts/collabora/1.2.18/ci/http-values.yaml
index 7180c98c81..6e1e4d5337 100644
--- a/charts/collabora/1.2.17/ci/http-values.yaml
+++ b/charts/collabora/1.2.18/ci/http-values.yaml
@@ -2,7 +2,10 @@ nodePort: 31980
 config:
   DONT_GEN_SSL_CERT: 'true'
   dictionaries: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru
-  domain: nextcloud\.domain\.tld|othernextcloud\.domain\.tld
+  enableWebUI: false
+  aliasgroup1:
+    - nextcloud.domain.tld
+    - othernextcloud.domain.tld
   extra_params: --o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true
     --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+
   password: changeme
diff --git a/charts/collabora/1.2.17/ci/https-values.yaml b/charts/collabora/1.2.18/ci/https-values.yaml
similarity index 99%
rename from charts/collabora/1.2.17/ci/https-values.yaml
rename to charts/collabora/1.2.18/ci/https-values.yaml
index 82a3723eef..833425a50f 100644
--- a/charts/collabora/1.2.17/ci/https-values.yaml
+++ b/charts/collabora/1.2.18/ci/https-values.yaml
@@ -3,7 +3,10 @@ nodePort: 31980
 config:
   DONT_GEN_SSL_CERT: 'true'
   dictionaries: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru
-  domain: nextcloud\.domain\.tld|othernextcloud\.domain\.tld
+  enableWebUI: true
+  aliasgroup1:
+    - nextcloud.domain.tld
+    - othernextcloud.domain.tld
   extra_params: --o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true
     --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+
   password: changeme
diff --git a/charts/collabora/1.2.17/ix_values.yaml b/charts/collabora/1.2.18/ix_values.yaml
similarity index 100%
rename from charts/collabora/1.2.17/ix_values.yaml
rename to charts/collabora/1.2.18/ix_values.yaml
diff --git a/charts/collabora/1.2.17/metadata.yaml b/charts/collabora/1.2.18/metadata.yaml
similarity index 100%
rename from charts/collabora/1.2.17/metadata.yaml
rename to charts/collabora/1.2.18/metadata.yaml
diff --git a/charts/collabora/1.2.17/questions.yaml b/charts/collabora/1.2.18/questions.yaml
similarity index 87%
rename from charts/collabora/1.2.17/questions.yaml
rename to charts/collabora/1.2.18/questions.yaml
index 5dbc3cd147..a435502805 100644
--- a/charts/collabora/1.2.17/questions.yaml
+++ b/charts/collabora/1.2.18/questions.yaml
@@ -34,8 +34,17 @@ questions:
             type: string
             $ref:
               - "definitions/timezone"
+        - variable: enableWebUI
+          label: "Enable WebUI"
+          description: |
+            Enable WebUI for Collabora
+            If you enable this, you will need to set a username and password</br>
+          schema:
+            type: boolean
+            default: true
         - variable: username
           label: "Username for WebUI"
+          show_if: [[enableWebUI, "=", true]]
           schema:
             type: string
             default: "admin"
@@ -46,11 +55,24 @@ questions:
             type: string
             private: true
             default: "changeme"
+            show_if: [[enableWebUI, "=", true]]
             valid_chars: "[a-zA-Z0-9!@#%^&*?]{8,}"
             valid_chars_error: |
               Password must be at least 8 characters long</br>
               Can contain at numbers, letters, and the following characters: !@#%^&*?
             required: true
+        - variable: aliasgroup1
+          label: "Alias Group 1"
+          description: |
+            List of domains that will be allowed to access the Collabora server
+            Type one domain per line
+          schema:
+            type: list
+            items:
+              - variable: alias
+                label: "Alias"
+                schema:
+                  type: string
         - variable: dictionaries
           label: "Dictionaries to use, leave empty to use all"
           schema:
@@ -61,7 +83,7 @@ questions:
           description: 'e.g. "--o:welcome.enable=false", See more on /etc/loolwsd/loowsd.xml. Separate params with space'
           schema:
             type: string
-            default: "--o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+"
+            default: "--o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false --o:net.proto=IPv4"
         - variable: server_name
           label: "Server Name"
           description: |
diff --git a/charts/collabora/1.2.17/templates/_helpers.tpl b/charts/collabora/1.2.18/templates/_helpers.tpl
similarity index 100%
rename from charts/collabora/1.2.17/templates/_helpers.tpl
rename to charts/collabora/1.2.18/templates/_helpers.tpl
diff --git a/charts/collabora/1.2.17/templates/deployment.yaml b/charts/collabora/1.2.18/templates/deployment.yaml
similarity index 92%
rename from charts/collabora/1.2.17/templates/deployment.yaml
rename to charts/collabora/1.2.18/templates/deployment.yaml
index 8aba01f092..9712015316 100644
--- a/charts/collabora/1.2.17/templates/deployment.yaml
+++ b/charts/collabora/1.2.18/templates/deployment.yaml
@@ -113,7 +113,7 @@ spec:
           {{ $secretName := (include "secretName" .) }}
           {{ $envConfig := .Values.config }}
           {{ $envList = mustAppend $envList (dict "name" "timezone" "value" $envConfig.timezone) }}
-          {{ $envList = mustAppend $envList (dict "name" "aliasgroup1" "value" $envConfig.domain) }}
+          {{ $envList = mustAppend $envList (dict "name" "aliasgroup1" "value" (join "," $envConfig.aliasgroup1)) }}
           {{ $envList = mustAppend $envList (dict "name" "dictionaries" "value" $envConfig.dictionaries) }}
           {{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }}
           {{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" "true") }}
@@ -122,8 +122,10 @@ spec:
           {{ else }}
             {{ $envList = mustAppend $envList (dict "name" "server_name" "value" (printf "%v" $envConfig.server_name)) }}
           {{ end }}
-          {{ $envList = mustAppend $envList (dict "name" "username" "valueFromSecret" true "secretName" $secretName "secretKey" "username") }}
-          {{ $envList = mustAppend $envList (dict "name" "password" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }}
+          {{ if $envConfig.enableWebUI }}
+            {{ $envList = mustAppend $envList (dict "name" "username" "valueFromSecret" true "secretName" $secretName "secretKey" "username") }}
+            {{ $envList = mustAppend $envList (dict "name" "password" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }}
+          {{ end }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
       volumes:
         {{ if .Values.certificate }}
diff --git a/charts/collabora/1.2.17/templates/nginx-conf.yaml b/charts/collabora/1.2.18/templates/nginx-conf.yaml
similarity index 100%
rename from charts/collabora/1.2.17/templates/nginx-conf.yaml
rename to charts/collabora/1.2.18/templates/nginx-conf.yaml
diff --git a/charts/collabora/1.2.17/templates/secrets.yaml b/charts/collabora/1.2.18/templates/secrets.yaml
similarity index 83%
rename from charts/collabora/1.2.17/templates/secrets.yaml
rename to charts/collabora/1.2.18/templates/secrets.yaml
index eef7981a90..d2b3c41aec 100644
--- a/charts/collabora/1.2.17/templates/secrets.yaml
+++ b/charts/collabora/1.2.18/templates/secrets.yaml
@@ -1,3 +1,4 @@
+{{ if or .Values.config.enableWebUI .Values.certificate }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -5,8 +6,10 @@ metadata:
   labels: {{ include "common.labels" . | nindent 4 }}
 type: Opaque
 data:
+  {{ if .Values.config.enableWebUI }}
   username: {{ .Values.config.username | b64enc | quote }}
   password: {{ .Values.config.password | b64enc | quote }}
+  {{ end }}
   {{ if .Values.certificate }}
     {{ if eq (include "certAvailable" .) "true" }}
   certPublicKey: {{ (include "cert.publicKey" .) | toString | b64enc | quote }}
@@ -15,3 +18,4 @@ data:
       {{ fail "No certificate configured for Collabora" }}
     {{ end }}
   {{ end }}
+{{ end }}
diff --git a/charts/collabora/1.2.17/templates/service.yaml b/charts/collabora/1.2.18/templates/service.yaml
similarity index 100%
rename from charts/collabora/1.2.17/templates/service.yaml
rename to charts/collabora/1.2.18/templates/service.yaml