diff --git a/library/ix-dev/charts/nextcloud/ci/basic-values.yaml b/library/ix-dev/charts/nextcloud/ci/basic-values.yaml
index 89c1f64424..beb6ba7078 100644
--- a/library/ix-dev/charts/nextcloud/ci/basic-values.yaml
+++ b/library/ix-dev/charts/nextcloud/ci/basic-values.yaml
@@ -2,7 +2,7 @@ ncConfig:
   adminUser: admin
   adminPassword: password
   host: "127.0.0.1"
-  dataDir: /var/www/html
+  dataDir: /var/www/html/data
   commands:
     - ffmpeg
     - smbclient
@@ -18,10 +18,7 @@ ncNetwork:
 
 ncStorage:
   pgData:
-    type: emptyDir
-    emptyDirConfig:
-      medium: ""
-      size: ""
+    type: pvc
   pgBackup:
     type: emptyDir
     emptyDirConfig:
diff --git a/library/ix-dev/charts/nextcloud/templates/_configuration.tpl b/library/ix-dev/charts/nextcloud/templates/_configuration.tpl
index d29116a4f2..18b5ecb5ef 100644
--- a/library/ix-dev/charts/nextcloud/templates/_configuration.tpl
+++ b/library/ix-dev/charts/nextcloud/templates/_configuration.tpl
@@ -38,17 +38,20 @@ secret:
   nextcloud-creds:
     enabled: true
     data:
-      POSTGRES_HOST: {{ $dbHost }}
+      POSTGRES_HOST: {{ $dbHost }}:5432
       POSTGRES_DB: {{ $dbName }}
       POSTGRES_USER: {{ $dbUser }}
       POSTGRES_PASSWORD: {{ $dbPass }}
       NEXTCLOUD_DATA_DIR: {{ .Values.ncConfig.dataDir }}
       PHP_UPLOAD_LIMIT: {{ printf "%vG" .Values.ncConfig.maxUploadLimit | default 3 }}
       PHP_MEMORY_LIMIT: {{ printf "%vM" .Values.ncConfig.phpMemoryLimit | default 512 }}
+      NEXTCLOUD_TRUSTED_DOMAINS: {{ list .Values.ncConfig.host "127.0.0.1" "localhost" "10.0.0.8/8" (printf "%v-*" $fullname) $fullname | mustUniq | join " " | quote }}
+      NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser }}
+      NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword }}
     {{- if .Values.ncNetwork.certificateID }}
       APACHE_DISABLE_REWRITE_IP: "1"
       OVERWRITEPROTOCOL: "https"
-      TRUSTED_PROXIES: "127.0.0.1"
+      TRUSTED_PROXIES: {{ list "127.0.0.1" "localhost" .Values.ncConfig.host | mustUniq | join "," | quote }}
       {{- if and .Values.ncConfig.host .Values.ncNetwork.webPort }}
         {{- if .Values.ncConfig.nginx.useDifferentAccessPort }}
       OVERWRITEHOST: {{ .Values.ncConfig.host }}
@@ -57,9 +60,6 @@ secret:
         {{- end }}
       {{- end }}
     {{- end }}
-      NEXTCLOUD_TRUSTED_DOMAINS: {{ (list .Values.ncConfig.host "127.0.0.1" "localhost") | mustUniq | join "," | quote }}
-      NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser }}
-      NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword }}
   {{- if eq (include "nextcloud.is-migration" $) "true" }}
   postgres-backup-creds:
     enabled: true
@@ -71,7 +71,7 @@ secret:
       POSTGRES_USER: {{ $dbUser }}
       POSTGRES_DB: {{ $dbName }}
       POSTGRES_PASSWORD: {{ $dbPass }}
-      POSTGRES_HOST: {{ $dbHost }}-ha
+      POSTGRES_HOST: {{ $dbHost }}-nc
       POSTGRES_URL: {{ printf "postgres://%s:%s@%s-ha:5432/%s?sslmode=disable" $dbUser $dbPass $dbHost $dbName }}
   {{- end }}
 {{- end -}}
diff --git a/library/ix-dev/charts/nextcloud/templates/_persistence.tpl b/library/ix-dev/charts/nextcloud/templates/_persistence.tpl
index eb0975aa5d..3a54443bc2 100644
--- a/library/ix-dev/charts/nextcloud/templates/_persistence.tpl
+++ b/library/ix-dev/charts/nextcloud/templates/_persistence.tpl
@@ -1,5 +1,13 @@
 {{- define "nextcloud.persistence" -}}
 persistence:
+  data: # TODO:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      nextcloud:
+        nextcloud:
+          mountPath: {{ .Values.ncConfig.dataDir }}
+
   # config:
   #   enabled: true
   #   targetSelector:
diff --git a/library/ix-dev/charts/nextcloud/templates/_service.tpl b/library/ix-dev/charts/nextcloud/templates/_service.tpl
index 2c7f9a0da6..82c9a98cca 100644
--- a/library/ix-dev/charts/nextcloud/templates/_service.tpl
+++ b/library/ix-dev/charts/nextcloud/templates/_service.tpl
@@ -16,7 +16,7 @@ service:
         {{- if not .Values.ncNetwork.certificateID }}
         nodePort: {{ .Values.ncNetwork.webPort }}
         {{- end }}
-        port: 80
+        port: {{ .Values.ncNetwork.webPort }}
         targetPort: 80
         targetSelector: nextcloud
   {{- if .Values.ncNetwork.certificateID }}
diff --git a/library/ix-dev/charts/nextcloud/values.yaml b/library/ix-dev/charts/nextcloud/values.yaml
index eb8219dc2a..43cd074b97 100644
--- a/library/ix-dev/charts/nextcloud/values.yaml
+++ b/library/ix-dev/charts/nextcloud/values.yaml
@@ -26,7 +26,7 @@ ncConfig:
   adminUser: admin
   adminPassword: password
   host: ""
-  dataDir: /var/www/html
+  dataDir: /var/www/html/data
   commands:
     - ffmpeg
     - smbclient