diff --git a/helm-chart/zxporter/templates/NOTES.txt b/helm-chart/zxporter/templates/NOTES.txt
index ddc06283..451e6787 100644
--- a/helm-chart/zxporter/templates/NOTES.txt
+++ b/helm-chart/zxporter/templates/NOTES.txt
@@ -98,10 +98,10 @@ High availability configuration is enabled with Pod Disruption Budget.
 {{- end }}
 
 To check the ZXPorter status:
-  $ kubectl get pods -n {{ .Values.namespace }} -l control-plane=controller-manager
-  $ kubectl logs -f deployment/devzero-zxporter-controller-manager -n {{ .Values.namespace }}
+  $ kubectl get pods -n {{ .Release.Namespace }} -l control-plane=controller-manager
+  $ kubectl logs -f deployment/devzero-zxporter-controller-manager -n {{ .Release.Namespace }}
 
 For troubleshooting:
-  $ kubectl describe deployment devzero-zxporter-controller-manager -n {{ .Values.namespace }}
+  $ kubectl describe deployment devzero-zxporter-controller-manager -n {{ .Release.Namespace }}
 
 For more information, visit: https://devzero.io/docs
\ No newline at end of file
diff --git a/helm-chart/zxporter/templates/configmap.yaml b/helm-chart/zxporter/templates/configmap.yaml
index 217a9114..20798397 100644
--- a/helm-chart/zxporter/templates/configmap.yaml
+++ b/helm-chart/zxporter/templates/configmap.yaml
@@ -56,4 +56,4 @@ data:
 kind: ConfigMap
 metadata:
   name: {{ .Values.zxporter.tokenConfigMapName }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
diff --git a/helm-chart/zxporter/templates/deployment.yaml b/helm-chart/zxporter/templates/deployment.yaml
index 09ed4fef..811a3879 100644
--- a/helm-chart/zxporter/templates/deployment.yaml
+++ b/helm-chart/zxporter/templates/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: devzero-zxporter
     control-plane: controller-manager
   name: devzero-zxporter-controller-manager
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/helm-chart/zxporter/templates/node-exporter-daemonset.yaml b/helm-chart/zxporter/templates/node-exporter-daemonset.yaml
index 2a2d7d21..c512ad02 100644
--- a/helm-chart/zxporter/templates/node-exporter-daemonset.yaml
+++ b/helm-chart/zxporter/templates/node-exporter-daemonset.yaml
@@ -5,7 +5,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: dz-prometheus-node-exporter
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     helm.sh/chart: prometheus-node-exporter-4.47.0
     app.kubernetes.io/managed-by: Helm
diff --git a/helm-chart/zxporter/templates/poddisruptionbudget.yaml b/helm-chart/zxporter/templates/poddisruptionbudget.yaml
index cb5f6db4..1a4b6a39 100644
--- a/helm-chart/zxporter/templates/poddisruptionbudget.yaml
+++ b/helm-chart/zxporter/templates/poddisruptionbudget.yaml
@@ -3,7 +3,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "zxporter.fullname" . }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "zxporter.labels" . | nindent 4 }}
 spec:
diff --git a/helm-chart/zxporter/templates/prometheus-configmap.yaml b/helm-chart/zxporter/templates/prometheus-configmap.yaml
index c913924c..9c66428a 100644
--- a/helm-chart/zxporter/templates/prometheus-configmap.yaml
+++ b/helm-chart/zxporter/templates/prometheus-configmap.yaml
@@ -12,7 +12,7 @@ metadata:
     helm.sh/chart: prometheus-27.20.0
     app.kubernetes.io/part-of: dz-prometheus
   name: prometheus-dz-prometheus-server
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 data:
   allow-snippet-annotations: "false"
   alerting_rules.yml: |
diff --git a/helm-chart/zxporter/templates/prometheus-deployments.yaml b/helm-chart/zxporter/templates/prometheus-deployments.yaml
index a978a5fa..7593102c 100644
--- a/helm-chart/zxporter/templates/prometheus-deployments.yaml
+++ b/helm-chart/zxporter/templates/prometheus-deployments.yaml
@@ -5,7 +5,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus-kube-state-metrics
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     helm.sh/chart: kube-state-metrics-5.33.2
     app.kubernetes.io/managed-by: Helm
@@ -113,7 +113,7 @@ metadata:
     helm.sh/chart: prometheus-27.20.0
     app.kubernetes.io/part-of: dz-prometheus
   name: prometheus-dz-prometheus-server
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
diff --git a/helm-chart/zxporter/templates/prometheus-rbac.yaml b/helm-chart/zxporter/templates/prometheus-rbac.yaml
index 3918988c..333c82c0 100644
--- a/helm-chart/zxporter/templates/prometheus-rbac.yaml
+++ b/helm-chart/zxporter/templates/prometheus-rbac.yaml
@@ -89,7 +89,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: prometheus-kube-state-metrics
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
 ---
 # Source: prometheus/templates/clusterrolebinding.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -106,7 +106,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: prometheus-dz-prometheus-server
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/helm-chart/zxporter/templates/prometheus-serviceaccounts.yaml b/helm-chart/zxporter/templates/prometheus-serviceaccounts.yaml
index 576a0fb1..f54b90d4 100644
--- a/helm-chart/zxporter/templates/prometheus-serviceaccounts.yaml
+++ b/helm-chart/zxporter/templates/prometheus-serviceaccounts.yaml
@@ -14,7 +14,7 @@ metadata:
     app.kubernetes.io/instance: prometheus
     app.kubernetes.io/version: "2.15.0"
   name: prometheus-kube-state-metrics
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 ---
 # Source: prometheus/templates/serviceaccount.yaml
 apiVersion: v1
@@ -28,7 +28,7 @@ metadata:
     helm.sh/chart: prometheus-27.20.0
     app.kubernetes.io/part-of: dz-prometheus
   name: prometheus-dz-prometheus-server
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   annotations: {}
 ---
 # Source: prometheus-node-exporter/templates/serviceaccount.yaml
@@ -36,7 +36,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: dz-prometheus-node-exporter
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     helm.sh/chart: prometheus-node-exporter-4.47.0
     app.kubernetes.io/managed-by: Helm
diff --git a/helm-chart/zxporter/templates/prometheus-services.yaml b/helm-chart/zxporter/templates/prometheus-services.yaml
index 2ac0f2f4..51f1e8f9 100644
--- a/helm-chart/zxporter/templates/prometheus-services.yaml
+++ b/helm-chart/zxporter/templates/prometheus-services.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: prometheus-kube-state-metrics
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     helm.sh/chart: kube-state-metrics-5.33.2
     app.kubernetes.io/managed-by: Helm
@@ -39,7 +39,7 @@ metadata:
     helm.sh/chart: prometheus-27.20.0
     app.kubernetes.io/part-of: dz-prometheus
   name: prometheus-dz-prometheus-server
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - name: http
@@ -58,7 +58,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dz-prometheus-node-exporter
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     helm.sh/chart: prometheus-node-exporter-4.47.0
     app.kubernetes.io/managed-by: Helm
diff --git a/helm-chart/zxporter/templates/secret-credentials.yaml b/helm-chart/zxporter/templates/secret-credentials.yaml
index 96996b9a..252e4c5d 100644
--- a/helm-chart/zxporter/templates/secret-credentials.yaml
+++ b/helm-chart/zxporter/templates/secret-credentials.yaml
@@ -6,7 +6,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.zxporter.tokenCredentialsSecretName }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: zxporter
     app.kubernetes.io/component: credentials
diff --git a/helm-chart/zxporter/templates/secret.yaml b/helm-chart/zxporter/templates/secret.yaml
index 922e1b68..f03b8f4f 100644
--- a/helm-chart/zxporter/templates/secret.yaml
+++ b/helm-chart/zxporter/templates/secret.yaml
@@ -8,7 +8,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.zxporter.tokenSecretName }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: zxporter
     app.kubernetes.io/component: runtime-tokens
diff --git a/helm-chart/zxporter/templates/service.yaml b/helm-chart/zxporter/templates/service.yaml
index cc85d9dd..ece5c4da 100644
--- a/helm-chart/zxporter/templates/service.yaml
+++ b/helm-chart/zxporter/templates/service.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name: devzero-zxporter
     control-plane: controller-manager
   name: devzero-zxporter-controller-manager-metrics-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - name: https
diff --git a/helm-chart/zxporter/templates/serviceaccount.yaml b/helm-chart/zxporter/templates/serviceaccount.yaml
index 81e6b938..877c025e 100644
--- a/helm-chart/zxporter/templates/serviceaccount.yaml
+++ b/helm-chart/zxporter/templates/serviceaccount.yaml
@@ -5,4 +5,4 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: devzero-zxporter
   name: devzero-zxporter-controller-manager
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
diff --git a/helm-chart/zxporter/templates/zxporter-rbac.yaml b/helm-chart/zxporter/templates/zxporter-rbac.yaml
index 73d07a9c..99d816b5 100644
--- a/helm-chart/zxporter/templates/zxporter-rbac.yaml
+++ b/helm-chart/zxporter/templates/zxporter-rbac.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: devzero-zxporter
   name: devzero-zxporter-leader-election-role
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 rules:
   # Leader election coordination
   - apiGroups:
@@ -579,7 +579,7 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: devzero-zxporter
   name: devzero-zxporter-leader-election-rolebinding
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -587,7 +587,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: devzero-zxporter-controller-manager
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -603,7 +603,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: devzero-zxporter-controller-manager
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -616,4 +616,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: devzero-zxporter-controller-manager
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
diff --git a/helm-chart/zxporter/values.yaml b/helm-chart/zxporter/values.yaml
index a699a0b0..4c659801 100644
--- a/helm-chart/zxporter/values.yaml
+++ b/helm-chart/zxporter/values.yaml
@@ -8,8 +8,6 @@
 #
 # For production deployments, we recommend using patToken for automatic token exchange.
 
-namespace: devzero-zxporter
-
 image:
   repository: docker.io/devzeroinc/zxporter
   pullPolicy: IfNotPresent