diff --git a/argocd/countly-hosted/applicationsets/00-mongodb.yaml b/argocd/countly-hosted/applicationsets/00-mongodb.yaml
index 74e75b1..b7aa2ba 100644
--- a/argocd/countly-hosted/applicationsets/00-mongodb.yaml
+++ b/argocd/countly-hosted/applicationsets/00-mongodb.yaml
@@ -29,8 +29,8 @@ spec:
             valueFiles:
               - "../../profiles/security/{{ .security }}/mongodb.yaml"
               - "$values/environments/{{ .environment }}/global.yaml"
-              - "$values/environments/{{ .environment }}/mongodb.yaml"
               - "../../profiles/sizing/{{ .sizing }}/mongodb.yaml"
+              - "$values/environments/{{ .environment }}/mongodb.yaml"
               - "$values/environments/{{ .environment }}/credentials-mongodb.yaml"
             parameters:
               - name: argocd.enabled
diff --git a/argocd/countly-hosted/applicationsets/01-clickhouse.yaml b/argocd/countly-hosted/applicationsets/01-clickhouse.yaml
index fd00315..e66dd2c 100644
--- a/argocd/countly-hosted/applicationsets/01-clickhouse.yaml
+++ b/argocd/countly-hosted/applicationsets/01-clickhouse.yaml
@@ -29,8 +29,8 @@ spec:
             valueFiles:
               - "../../profiles/security/{{ .security }}/clickhouse.yaml"
               - "$values/environments/{{ .environment }}/global.yaml"
-              - "$values/environments/{{ .environment }}/clickhouse.yaml"
               - "../../profiles/sizing/{{ .sizing }}/clickhouse.yaml"
+              - "$values/environments/{{ .environment }}/clickhouse.yaml"
               - "$values/environments/{{ .environment }}/credentials-clickhouse.yaml"
             parameters:
               - name: argocd.enabled
diff --git a/argocd/countly-hosted/applicationsets/02-kafka.yaml b/argocd/countly-hosted/applicationsets/02-kafka.yaml
index 41f1d83..f219a62 100644
--- a/argocd/countly-hosted/applicationsets/02-kafka.yaml
+++ b/argocd/countly-hosted/applicationsets/02-kafka.yaml
@@ -31,9 +31,9 @@ spec:
               - "../../profiles/observability/{{ .observability }}/kafka.yaml"
               - "../../profiles/security/{{ .security }}/kafka.yaml"
               - "$values/environments/{{ .environment }}/global.yaml"
-              - "$values/environments/{{ .environment }}/kafka.yaml"
               - "../../profiles/kafka-connect-sizing/{{ $kcSizing := dig \"kafkaConnectSizing\" \"auto\" . }}{{ if or (eq $kcSizing \"\") (eq $kcSizing \"auto\") }}{{ .sizing }}{{ else }}{{ $kcSizing }}{{ end }}/kafka.yaml"
               - "../../profiles/sizing/{{ .sizing }}/kafka.yaml"
+              - "$values/environments/{{ .environment }}/kafka.yaml"
               - "$values/environments/{{ .environment }}/credentials-kafka.yaml"
             parameters:
               - name: argocd.enabled
diff --git a/argocd/countly-hosted/applicationsets/03-countly.yaml b/argocd/countly-hosted/applicationsets/03-countly.yaml
index 720ec65..7807c81 100644
--- a/argocd/countly-hosted/applicationsets/03-countly.yaml
+++ b/argocd/countly-hosted/applicationsets/03-countly.yaml
@@ -31,8 +31,8 @@ spec:
               - "../../profiles/observability/{{ .observability }}/countly.yaml"
               - "../../profiles/security/{{ .security }}/countly.yaml"
               - "$values/environments/{{ .environment }}/global.yaml"
-              - "$values/environments/{{ .environment }}/countly.yaml"
               - "../../profiles/sizing/{{ .sizing }}/countly.yaml"
+              - "$values/environments/{{ .environment }}/countly.yaml"
               - "$values/environments/{{ .environment }}/credentials-countly.yaml"
             parameters:
               - name: argocd.enabled
diff --git a/argocd/countly-hosted/applicationsets/04-observability.yaml b/argocd/countly-hosted/applicationsets/04-observability.yaml
index abd39af..ef50f32 100644
--- a/argocd/countly-hosted/applicationsets/04-observability.yaml
+++ b/argocd/countly-hosted/applicationsets/04-observability.yaml
@@ -30,8 +30,8 @@ spec:
               - "../../profiles/observability/{{ .observability }}/observability.yaml"
               - "../../profiles/security/{{ .security }}/observability.yaml"
               - "$values/environments/{{ .environment }}/global.yaml"
-              - "$values/environments/{{ .environment }}/observability.yaml"
               - "../../profiles/sizing/{{ .sizing }}/observability.yaml"
+              - "$values/environments/{{ .environment }}/observability.yaml"
               - "$values/environments/{{ .environment }}/credentials-observability.yaml"
             parameters:
               - name: argocd.enabled
diff --git a/charts/countly-clickhouse/templates/storageclass.yaml b/charts/countly-clickhouse/templates/storageclass.yaml
new file mode 100644
index 0000000..9c2d8ef
--- /dev/null
+++ b/charts/countly-clickhouse/templates/storageclass.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.server.persistence.createStorageClass }}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .Values.server.persistence.storageClassName }}
+  labels:
+    {{- include "countly-clickhouse.labels" . | nindent 4 }}
+allowVolumeExpansion: true
+provisioner: pd.csi.storage.gke.io
+parameters:
+  type: pd-balanced
+reclaimPolicy: Retain
+volumeBindingMode: WaitForFirstConsumer
+{{- end }}
diff --git a/charts/countly-clickhouse/values.yaml b/charts/countly-clickhouse/values.yaml
index 665f32a..8574031 100644
--- a/charts/countly-clickhouse/values.yaml
+++ b/charts/countly-clickhouse/values.yaml
@@ -102,6 +102,12 @@ server:
     storageClass: ""
     # -- Data volume size per server replica
     size: 50Gi
+    # -- Reclaim policy for the data PV (Delete or Retain)
+    reclaimPolicy: "Retain"
+    # -- Create a dedicated StorageClass with reclaimPolicy Retain
+    createStorageClass: false
+    # -- Name of the StorageClass to create (used when createStorageClass is true)
+    storageClassName: "standard-rwo-retain"
   # -- ClickHouse server settings
   settings:
     # -- Maximum concurrent connections