diff --git a/mcord/mcord-control-plane/templates/cassandra.yaml b/mcord/mcord-control-plane/templates/cassandra.yaml
index 9f85e03..312233b 100644
--- a/mcord/mcord-control-plane/templates/cassandra.yaml
+++ b/mcord/mcord-control-plane/templates/cassandra.yaml
@@ -44,7 +44,9 @@
     metadata:
       labels:
         app: cassandra
-    spec:
+    spec:    
+      nodeSelector:
+       kubernetes.io/hostname: "node3"
       terminationGracePeriodSeconds: 1
       containers:
       - name: cassandra
diff --git a/mcord/mcord-control-plane/templates/cp.yaml b/mcord/mcord-control-plane/templates/cp.yaml
index 35fbe20..2197347 100644
--- a/mcord/mcord-control-plane/templates/cp.yaml
+++ b/mcord/mcord-control-plane/templates/cp.yaml
@@ -31,6 +31,20 @@
     port: {{ .Values.ngic_cp.ports.sx }}
     protocol: UDP
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ngic-cp-external
+spec:
+  selector:
+    app: ngic-cp
+  type: NodePort
+  ports:
+    - name: sx
+      port: {{ .Values.ngic_cp.ports.sx }}
+      nodePort: {{ .Values.ngic_cp.ports.sx_external }}
+      protocol: UDP
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -48,6 +62,8 @@
       labels:
         app: ngic-cp
     spec:
+      nodeSelector:
+        kubernetes.io/hostname: "node2"
       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 69dd53a..7a04bcb 100644
--- a/mcord/mcord-control-plane/templates/hss.yaml
+++ b/mcord/mcord-control-plane/templates/hss.yaml
@@ -45,6 +45,8 @@
       labels:
         app: hss
     spec:
+      nodeSelector:
+        kubernetes.io/hostname: "node3"
       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 d6946de..89e7309 100644
--- a/mcord/mcord-control-plane/templates/mme.yaml
+++ b/mcord/mcord-control-plane/templates/mme.yaml
@@ -24,15 +24,9 @@
     app: mme
   clusterIP: None
   ports:
-  - name: s11
-    port: {{ .Values.mme.ports.s11 }}
-    protocol: UDP
   - name: s1ap
     port: {{ .Values.mme.ports.s1ap }}
     protocol: SCTP
-  - name: s6a
-    port: {{ .Values.mme.ports.s6a }}
-    protocol: TCP
 ---
 apiVersion: v1
 kind: Service
@@ -40,21 +34,13 @@
   name: mme-external
 spec:
   selector:
-    app: mme-external
+    app: mme
   type: NodePort
   ports:
-    - name: s11
-      port: {{ .Values.mme.ports.s11 }}
-      nodePort: {{ .Values.mme.ports.s11_external }}
-      protocol: TCP
     - name: s1ap
       port: {{ .Values.mme.ports.s1ap }}
       nodePort: {{ .Values.mme.ports.s1ap_external }}
-      protocol: TCP
-    - name: s6a
-      port: {{ .Values.mme.ports.s6a }}
-      nodePort: {{ .Values.mme.ports.s6a_external }}
-      protocol: TCP
+      protocol: SCTP
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -73,6 +59,8 @@
       labels:
         app: mme
     spec:
+      nodeSelector:
+        kubernetes.io/hostname: "node2"
       terminationGracePeriodSeconds: 1
       initContainers:
       - name: init-mme
@@ -100,7 +88,7 @@
           - name: ENB_S1AP_IP
             value: {{ .Values.accelleran_hostname }}
           - name: ENB_S1AP_PORT
-            value: "{{ .Values.mme.ports.s1ap }}"   #ng4t uses 32767
+            value: "{{ .Values.accelleran_port }}"   #ng4t uses 32767
           - name: CONNECT_PEER
             value: hss-0.{{ .Values.hss_hostname }}.{{ .Values.namespace }}.svc.cluster.local
           - name: VAR_HSS_REALM