diff --git a/mcord/mcord-control-plane/Chart.yaml b/mcord/mcord-control-plane/Chart.yaml
index 364cac2..be88bdb 100644
--- a/mcord/mcord-control-plane/Chart.yaml
+++ b/mcord/mcord-control-plane/Chart.yaml
@@ -18,4 +18,4 @@
 appVersion: "1.0"
 description: A Helm chart for MCORD Control Plane Services
 name: mcord-control-plane
-version: 0.2.1
+version: 0.2.2
diff --git a/mcord/mcord-control-plane/templates/cassandra.yaml b/mcord/mcord-control-plane/templates/cassandra.yaml
index 312233b..cdb827c 100644
--- a/mcord/mcord-control-plane/templates/cassandra.yaml
+++ b/mcord/mcord-control-plane/templates/cassandra.yaml
@@ -46,7 +46,7 @@
         app: cassandra
     spec:    
       nodeSelector:
-       kubernetes.io/hostname: "node3"
+       kubernetes.io/hostname: "{{ .Values.hssdb_node_selector }}"
       terminationGracePeriodSeconds: 1
       containers:
       - name: cassandra
diff --git a/mcord/mcord-control-plane/templates/cp.yaml b/mcord/mcord-control-plane/templates/cp.yaml
index 2197347..37ae75f 100644
--- a/mcord/mcord-control-plane/templates/cp.yaml
+++ b/mcord/mcord-control-plane/templates/cp.yaml
@@ -63,7 +63,7 @@
         app: ngic-cp
     spec:
       nodeSelector:
-        kubernetes.io/hostname: "node2"
+        kubernetes.io/hostname: "{{ .Values.spgwc_node_selector }}"
       initContainers:
       - name: init-iptables
         image: {{ .Values.ngic_cp.images.init }}
diff --git a/mcord/mcord-control-plane/templates/hss.yaml b/mcord/mcord-control-plane/templates/hss.yaml
index d6d2f7e..9dd3918 100644
--- a/mcord/mcord-control-plane/templates/hss.yaml
+++ b/mcord/mcord-control-plane/templates/hss.yaml
@@ -46,7 +46,7 @@
         app: hss
     spec:
       nodeSelector:
-        kubernetes.io/hostname: "node3"
+        kubernetes.io/hostname: "{{ .Values.hss_node_selector }}"
       terminationGracePeriodSeconds: 1
       initContainers:
       - name: init-db
diff --git a/mcord/mcord-control-plane/templates/mme.yaml b/mcord/mcord-control-plane/templates/mme.yaml
index 89e7309..9685c82 100644
--- a/mcord/mcord-control-plane/templates/mme.yaml
+++ b/mcord/mcord-control-plane/templates/mme.yaml
@@ -60,7 +60,7 @@
         app: mme
     spec:
       nodeSelector:
-        kubernetes.io/hostname: "node2"
+        kubernetes.io/hostname: "{{ .Values.mme_node_selector }}"
       terminationGracePeriodSeconds: 1
       initContainers:
       - name: init-mme
diff --git a/mcord/mcord-control-plane/values.yaml b/mcord/mcord-control-plane/values.yaml
index 930cfcd..e226c0f 100644
--- a/mcord/mcord-control-plane/values.yaml
+++ b/mcord/mcord-control-plane/values.yaml
@@ -34,6 +34,12 @@
 accelleran_hostname: "10.90.0.132"
 accelleran_port: 31412
 
+hssdb_node_selector: node3
+hss_node_selector: node3
+mme_node_selector: node2
+spgwc_node_selector: node2
+
+
 hss:
   # TODO: init UE's IMEI to DB?
   images: