diff --git a/helm-chart/zxporter/templates/configmap.yaml b/helm-chart/zxporter/templates/configmap.yaml
index 84eafe32..ee7de548 100644
--- a/helm-chart/zxporter/templates/configmap.yaml
+++ b/helm-chart/zxporter/templates/configmap.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 data:
   BUFFER_SIZE: ""
-  CLUSTER_TOKEN: '{{ .cluster_token }}'
+  CLUSTER_TOKEN: "{{ .Values.zxporter.clusterToken }}"
   COLLECTION_FREQUENCY: ""
-  DAKR_URL: "https://dakr.devzero.io"
+  DAKR_URL: "{{ .Values.zxporter.dakrUrl }}"
   DISABLE_NETWORK_IO_METRICS: ""
   DISABLED_COLLECTORS: ""
   EXCLUDED_CLUSTERROLEBINDINGS: ""
@@ -38,7 +38,7 @@ data:
   EXCLUDED_STORAGECLASSES: ""
   EXCLUDED_VPAS: ""
   K8S_PROVIDER: 'AWS'
-  KUBE_CONTEXT_NAME: 'minikube'
+  KUBE_CONTEXT_NAME: "{{ .Values.zxporter.kubeContextName }}"
   MASK_SECRET_DATA: ""
   NODE_METRICS_INTERVAL: ""
   PROMETHEUS_URL: "{{ .Values.zxporter.prometheusUrl }}"
diff --git a/helm-chart/zxporter/values.yaml b/helm-chart/zxporter/values.yaml
index 4e5cff2b..9d3797dd 100644
--- a/helm-chart/zxporter/values.yaml
+++ b/helm-chart/zxporter/values.yaml
@@ -9,6 +9,8 @@ image:
 
 # ZXPorter configuration
 zxporter:
+  clusterToken: '{{ .cluster_token }}'
+  kubeContextName: '{{ .kube_context_name }}'
   dakrUrl: "https://dakr.devzero.io"
   prometheusUrl: "http://prometheus-dz-prometheus-server.devzero-zxporter.svc.cluster.local:80"
   targetNamespaces: ""