diff --git a/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml b/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml
index ad3e0dc..35bb000 100644
--- a/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml
+++ b/charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml
@@ -8,8 +8,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  {{- if .Values.global.storageClass }}
-  storageClassName: {{ .Values.global.storageClass }}
+  {{- if .Values.global.storageClassName }}
+  storageClassName: {{ .Values.global.storageClassName }}
   {{- end }}
   resources:
     requests:
diff --git a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
index 66c0176..0407207 100644
--- a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
+++ b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
@@ -123,8 +123,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  {{- if .Values.global.storageClass }}
-  storageClassName: {{ .Values.global.storageClass }}
+  {{- if .Values.global.storageClassName }}
+  storageClassName: {{ .Values.global.storageClassName }}
   {{- end }}
   resources:
     requests:
@@ -139,8 +139,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  {{- if .Values.global.storageClass }}
-  storageClassName: {{ .Values.global.storageClass }}
+  {{- if .Values.global.storageClassName }}
+  storageClassName: {{ .Values.global.storageClassName }}
   {{- end }}
   resources:
     requests:
diff --git a/charts/hdx-oss-v2/templates/ingress.yaml b/charts/hdx-oss-v2/templates/ingress.yaml
index 4d5edf0..4283d03 100644
--- a/charts/hdx-oss-v2/templates/ingress.yaml
+++ b/charts/hdx-oss-v2/templates/ingress.yaml
@@ -27,7 +27,7 @@ spec:
   tls:
   - hosts:
     - {{ .Values.hyperdx.ingress.host | default "localhost" }}
-    secretName: {{ .Values.hyperdx.ingress.tlsSecretName | default "hyperdx-tls" }}
+    secretName: {{ .Values.hyperdx.ingress.tls.secretName | default "hyperdx-tls" }}
   {{- end }}
   rules:
     - host: {{ .Values.hyperdx.ingress.host | default "localhost" }}
diff --git a/charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml b/charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml
index 9051fde..b445381 100644
--- a/charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml
+++ b/charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml
@@ -35,10 +35,10 @@ tests:
         isKind:
           of: PersistentVolumeClaim
 
-  - it: should include storageClassName when global.storageClass is set
+  - it: should include storageClassName when global.storageClassName is set
     set:
       global:
-        storageClass: "fast-ssd"
+        storageClassName: "fast-ssd"
       clickhouse:
         enabled: true
         persistence:
@@ -55,10 +55,10 @@ tests:
           path: spec.storageClassName
           value: "fast-ssd"
 
-  - it: should omit storageClassName when global.storageClass is empty
+  - it: should omit storageClassName when global.storageClassName is empty
     set:
       global:
-        storageClass: ""
+        storageClassName: ""
       clickhouse:
         enabled: true
         persistence:
diff --git a/charts/hdx-oss-v2/tests/ingress_test.yaml b/charts/hdx-oss-v2/tests/ingress_test.yaml
index 76e445f..d7af841 100644
--- a/charts/hdx-oss-v2/tests/ingress_test.yaml
+++ b/charts/hdx-oss-v2/tests/ingress_test.yaml
@@ -175,6 +175,24 @@ tests:
             nginx.ingress.kubernetes.io/ssl-redirect: "true"
             nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 
+  - it: should use custom TLS secret name when provided
+    set:
+      hyperdx:
+        ingress:
+          enabled: true
+          host: hyperdx.example.com
+          tls:
+            enabled: true
+            secretName: my-custom-tls-secret
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Ingress
+      - equal:
+          path: spec.tls[0].secretName
+          value: my-custom-tls-secret
+
   - it: should render additional ingress templates
     set:
       hyperdx:
diff --git a/charts/hdx-oss-v2/tests/persistence_test.yaml b/charts/hdx-oss-v2/tests/persistence_test.yaml
index 6263b89..2f06a0e 100644
--- a/charts/hdx-oss-v2/tests/persistence_test.yaml
+++ b/charts/hdx-oss-v2/tests/persistence_test.yaml
@@ -5,7 +5,7 @@ tests:
   - it: should use correct mongodb PVC name and size
     set:
       global:
-        storageClass: "custom-storage-class"
+        storageClassName: "custom-storage-class"
       mongodb:
         persistence:
           enabled: true
@@ -35,7 +35,7 @@ tests:
   - it: should omit storageClassName when global.storageClass is empty string
     set:
       global:
-        storageClass: ""
+        storageClassName: ""
       mongodb:
         persistence:
           enabled: true
diff --git a/charts/hdx-oss-v2/tests/pvc_test.yaml b/charts/hdx-oss-v2/tests/pvc_test.yaml
index f5cc27c..4e25e7b 100644
--- a/charts/hdx-oss-v2/tests/pvc_test.yaml
+++ b/charts/hdx-oss-v2/tests/pvc_test.yaml
@@ -9,7 +9,7 @@ tests:
           enabled: true
           dataSize: 10Gi
       global:
-        storageClass: standard
+        storageClassName: standard
     asserts:
       - isKind:
           of: PersistentVolumeClaim
@@ -42,14 +42,14 @@ tests:
           enabled: true
           dataSize: 10Gi
       global:
-        storageClass: ""
+        storageClassName: ""
     asserts:
       - isKind:
           of: PersistentVolumeClaim
       - isNull:
           path: spec.storageClassName
 
-  - it: should not include storageClassName when global.storageClass is not set
+  - it: should use default storageClassName when global.storageClassName is not explicitly overridden
     set:
       mongodb:
         persistence:
@@ -58,5 +58,6 @@ tests:
     asserts:
       - isKind:
           of: PersistentVolumeClaim
-      - isNull:
-          path: spec.storageClassName 
\ No newline at end of file
+      - equal:
+          path: spec.storageClassName
+          value: local-path 
\ No newline at end of file