diff --git a/mcord/mcord-data-plane/templates/_helpers.tpl b/mcord/mcord-data-plane/templates/_helpers.tpl
index 6eb0fdf..06c5286 100644
--- a/mcord/mcord-data-plane/templates/_helpers.tpl
+++ b/mcord/mcord-data-plane/templates/_helpers.tpl
@@ -31,10 +31,10 @@
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Values.namespace -}}
-{{- .Values.namespace | trunc 63 | trimSuffix "-" -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" .Values.namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/mcord/mcord-data-plane/templates/cm.yaml b/mcord/mcord-data-plane/templates/cm.yaml
index 37687d9..fe1ce19 100644
--- a/mcord/mcord-data-plane/templates/cm.yaml
+++ b/mcord/mcord-data-plane/templates/cm.yaml
@@ -16,7 +16,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ .Values.namespace }}
   name: ngicdp-config
 data:
   adc_rules.cfg: |
@@ -135,8 +134,8 @@
     [0]
     dp_comm_ip =  127.0.0.1
     dp_comm_port = 20
-    cp_comm_ip = ngic-cp-0.ngic-cp.{{ .Values.namespace }}.cluster.global
-    cp_comm_port = 21
+    cp_comm_ip = {{ .Values.controlplane_hostname }}
+    cp_comm_port = {{ .Values.controlplane_port }}
   meter_profile.cfg: |
     [GLOBAL]
     NUM_OF_IDX = 7
diff --git a/mcord/mcord-data-plane/templates/dp.yaml b/mcord/mcord-data-plane/templates/dp.yaml
index f7da922..a55bb52 100644
--- a/mcord/mcord-data-plane/templates/dp.yaml
+++ b/mcord/mcord-data-plane/templates/dp.yaml
@@ -17,7 +17,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: {{ .Values.namespace }}
   name: ngic-dp
 spec:
   selector:
@@ -31,7 +30,6 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  namespace: {{ .Values.namespace }}
   name: ngic-dp
   labels:
     app: ngic-dp
@@ -43,7 +41,6 @@
   serviceName: "ngic-dp"
   template:
     metadata:
-      namespace: {{ .Values.namespace }}
       labels:
         app: ngic-dp
       annotations:
diff --git a/mcord/mcord-data-plane/values.yaml b/mcord/mcord-data-plane/values.yaml
index 80c4852..b1626cd 100644
--- a/mcord/mcord-data-plane/values.yaml
+++ b/mcord/mcord-data-plane/values.yaml
@@ -17,6 +17,9 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+controlplane_hostname: "ngic-cp"
+controlplane_port: 21
+
 ngic_dp:
   images:
     init: "ngick8stesting/c3po-mmeinit"