diff --git a/deployment/helm/datamate/values.yaml b/deployment/helm/datamate/values.yaml
index 1330419..5bd2849 100644
--- a/deployment/helm/datamate/values.yaml
+++ b/deployment/helm/datamate/values.yaml
@@ -96,6 +96,9 @@ backend:
       mountPath: /operators
 
 frontend:
+  service:
+    type: NodePort
+    nodePort: 30000
   volumes:
     - *logVolume
     - name: datamate-nginx-conf
diff --git a/deployment/helm/milvus/charts/etcd/templates/deployment.yaml b/deployment/helm/milvus/charts/etcd/templates/deployment.yaml
index 4b3c13c..fd8a546 100644
--- a/deployment/helm/milvus/charts/etcd/templates/deployment.yaml
+++ b/deployment/helm/milvus/charts/etcd/templates/deployment.yaml
@@ -38,21 +38,21 @@ spec:
     spec:
       {{- include "etcd.imagePullSecrets" . | nindent 6 }}
         {{- if .Values.hostAliases }}
-        hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
+        hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 10 }}
         {{- end }}
         {{- if .Values.affinity }}
-        affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
+        affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 10 }}
         {{- else }}
         affinity:
-          podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 10 }}
-          podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 10 }}
-          nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }}
+          podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 12 }}
+          podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 12 }}
+          nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 12 }}
         {{- end }}
         {{- if .Values.nodeSelector }}
-        nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
+        nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 10 }}
         {{- end }}
         {{- if .Values.tolerations }}
-        tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
+        tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 10 }}
         {{- end }}
         {{- if .Values.terminationGracePeriodSeconds }}
         terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
@@ -61,7 +61,7 @@ spec:
         schedulerName: {{ .Values.schedulerName }}
         {{- end }}
         {{- if .Values.topologySpreadConstraints }}
-        topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 8 }}
+        topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 10 }}
         {{- end }}
         {{- if .Values.priorityClassName }}
         priorityClassName: {{ .Values.priorityClassName }}
@@ -70,7 +70,7 @@ spec:
         runtimeClassName: {{ .Values.runtimeClassName }}
         {{- end }}
         {{- if .Values.podSecurityContext.enabled }}
-        securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+        securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 10 }}
         {{- end }}
         {{- if .Values.shareProcessNamespace }}
         shareProcessNamespace: {{ .Values.shareProcessNamespace }}
@@ -79,7 +79,7 @@ spec:
         {{- if or .Values.initContainers (and .Values.volumePermissions.enabled .Values.persistence.enabled) }}
         initContainers:
           {{- if .Values.initContainers }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 10 }}
             {{- end }}
             {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
             - name: volume-permissions
@@ -93,7 +93,7 @@ spec:
               securityContext:
                 runAsUser: 0
               {{- if .Values.volumePermissions.resources }}
-              resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 12 }}
+              resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 14 }}
               {{- end }}
               volumeMounts:
                 - name: data
@@ -116,14 +116,14 @@ spec:
               securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
               {{- end }}
               {{- if .Values.diagnosticMode.enabled }}
-              command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
+              command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
               {{- else if .Values.command }}
-              command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 12 }}
+              command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 14 }}
               {{- end }}
               {{- if .Values.diagnosticMode.enabled }}
-              args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
+              args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
               {{- else if .Values.args }}
-              args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }}
+              args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 14 }}
               {{- end }}
               env:
                 - name: BITNAMI_DEBUG
@@ -248,7 +248,7 @@ spec:
                   value: {{ ternary "/snapshots" "/init-snapshot" (and .Values.disasterRecovery.enabled (not .Values.disasterRecovery.pvc.existingClaim)) | quote }}
                 {{- end }}
                 {{- if .Values.extraEnvVars }}
-                {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+                {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 14 }}
                 {{- end }}
               envFrom:
                 {{- if .Values.extraEnvVarsCM }}
@@ -268,7 +268,7 @@ spec:
                   protocol: TCP
               {{- if not .Values.diagnosticMode.enabled }}
               {{- if .Values.customLivenessProbe }}
-              livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
+              livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 14 }}
               {{- else if .Values.livenessProbe.enabled }}
               livenessProbe:
                 exec:
@@ -281,7 +281,7 @@ spec:
                 failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
               {{- end }}
               {{- if .Values.customReadinessProbe }}
-              readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
+              readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 14 }}
               {{- else if .Values.readinessProbe.enabled }}
               readinessProbe:
                 exec:
@@ -294,7 +294,7 @@ spec:
                 failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
               {{- end }}
               {{- if .Values.customStartupProbe }}
-              startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }}
+              startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 14 }}
               {{- else if .Values.startupProbe.enabled }}
               startupProbe:
                 exec:
@@ -307,7 +307,7 @@ spec:
                 failureThreshold: {{ .Values.startupProbe.failureThreshold }}
               {{- end }}
               {{- if .Values.lifecycleHooks }}
-              lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 12 }}
+              lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 14 }}
               {{- else if and (gt $replicaCount 1) .Values.removeMemberOnContainerTermination }}
               lifecycle:
                 preStop:
@@ -317,7 +317,7 @@ spec:
               {{- end }}
               {{- end }}
               {{- if .Values.resources }}
-              resources: {{- include "common.tplvalues.render" (dict "value" .Values.resources "context" $) | nindent 12 }}
+              resources: {{- include "common.tplvalues.render" (dict "value" .Values.resources "context" $) | nindent 14 }}
               {{- end }}
               volumeMounts:
                 - name: data
diff --git a/deployment/helm/milvus/templates/pvc.yaml b/deployment/helm/milvus/templates/pvc.yaml
index fa0a916..5983ecc 100644
--- a/deployment/helm/milvus/templates/pvc.yaml
+++ b/deployment/helm/milvus/templates/pvc.yaml
@@ -20,7 +20,7 @@ spec:
     apiVersion: v1
     kind: PersistentVolumeClaim
     name: {{ printf "%s" (include "milvus.fullname" . | trunc 58)}}
-    namespace: {{ .Values.global.namespace | default "datamate" }}
+    namespace: {{ .Release.Namespace | default "datamate" }}
   nodeAffinity:
     required:
       nodeSelectorTerms: