diff --git a/mcord/mcord-bbu/Chart.yaml b/mcord/mcord-bbu/Chart.yaml
index a93abb7..b19d877 100644
--- a/mcord/mcord-bbu/Chart.yaml
+++ b/mcord/mcord-bbu/Chart.yaml
@@ -18,4 +18,4 @@
 appVersion: "1.0"
 description: A Helm chart for MCORD BBU Services
 name: mcord-bbu
-version: 0.1.2
+version: 0.1.3
diff --git a/mcord/mcord-bbu/templates/accelleran.yaml b/mcord/mcord-bbu/templates/accelleran.yaml
index 79dbf4f..dbf2655 100644
--- a/mcord/mcord-bbu/templates/accelleran.yaml
+++ b/mcord/mcord-bbu/templates/accelleran.yaml
@@ -22,7 +22,7 @@
 spec:
   selector:
     app: accelleran
-  clusterIP: 10.116.0.1
+  clusterIP: None
   ports:
     - name: s1ap
       port: {{ .Values.accelleran.ports.s1ap }}
@@ -31,14 +31,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: accelleran
+  name: accelleran-external
 spec:
   selector:
-    app: accelleran
+    app: accelleran-external
   type: NodePort
   ports:
     - port: {{ .Values.accelleran.ports.s1ap }}
-      nodePort: {{ .Values.accelleran.ports.s1ap }}
+      nodePort: {{ .Values.accelleran.ports.s1ap_external }}
       protocol: TCP
 ---
 apiVersion: apps/v1
diff --git a/mcord/mcord-bbu/values.yaml b/mcord/mcord-bbu/values.yaml
index d7afd75..d3dfff4 100644
--- a/mcord/mcord-bbu/values.yaml
+++ b/mcord/mcord-bbu/values.yaml
@@ -29,6 +29,7 @@
     bbu: "10.90.0.131:30500/accelleran/vran-l3-fdd:onf-dns"
   ports:
     s1ap: 36412
+    s1ap_external: 30412
   replicas: 1
   nats_service_name: "nats-cluster"
   inst_id: "enb_key"
diff --git a/mcord/mcord-control-plane/Chart.yaml b/mcord/mcord-control-plane/Chart.yaml
index 21b43e0..ebc191e 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.1.7
+version: 0.1.8
diff --git a/mcord/mcord-control-plane/templates/cm.yaml b/mcord/mcord-control-plane/templates/cm.yaml
index 1122b7c..a834f9d 100644
--- a/mcord/mcord-control-plane/templates/cm.yaml
+++ b/mcord/mcord-control-plane/templates/cm.yaml
@@ -857,7 +857,7 @@
     VBSM_TARGET_MME_PLMN_ID          31310f
     VBSM_TARGET_MME_IP_ADDR          "192.25.1.100"
 
-    VBSM_T3412                        32
+    VBSM_T3412                        0
 
     VBSM_SGSN_IP_ADDR                "192.25.1.195"
 
diff --git a/mcord/mcord-control-plane/templates/cp.yaml b/mcord/mcord-control-plane/templates/cp.yaml
index eef9a4c..35fbe20 100644
--- a/mcord/mcord-control-plane/templates/cp.yaml
+++ b/mcord/mcord-control-plane/templates/cp.yaml
@@ -74,7 +74,7 @@
         - name: MME_S11_IP
           value: {{ .Values.mme_hostname }}
         - name: SGW_S11_IP
-          values: {{ .Values.spgwu_s11_ip }}
+          value: {{ .Values.spgwc_hostname }}
         - name: SGW_S1U_IP
           value: {{ .Values.spgwu_s1u_ip }}
         - name: APN
diff --git a/mcord/mcord-control-plane/templates/mme.yaml b/mcord/mcord-control-plane/templates/mme.yaml
index e74085d..d6946de 100644
--- a/mcord/mcord-control-plane/templates/mme.yaml
+++ b/mcord/mcord-control-plane/templates/mme.yaml
@@ -37,10 +37,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: mme
+  name: mme-external
 spec:
   selector:
-    app: mme
+    app: mme-external
   type: NodePort
   ports:
     - name: s11
@@ -92,7 +92,7 @@
         imagePullPolicy: Always
         env:
           - name: SGW_S11_IP
-            value: {{ .Values.spgwc_hostname }}
+            value: {{ .Values.spgwc_hostname }}.{{ .Values.namespace }}.svc.cluster.local
           - name: MME_ETH0_IP
             valueFrom:
               fieldRef:
diff --git a/mcord/mcord-control-plane/values.yaml b/mcord/mcord-control-plane/values.yaml
index 51833ed..a6ce49a 100644
--- a/mcord/mcord-control-plane/values.yaml
+++ b/mcord/mcord-control-plane/values.yaml
@@ -27,9 +27,9 @@
 # The spgwu_s1u_ip changes everytime, you can get it with this command:
 # ngic_sriov=$(kubectl exec -n epc ngic-dp-0 ifconfig s1u-net | grep 'inet addr' | cut -d: -f2 | awk '{print $1}')
 # and use it in the chart with --set spgwu_s1u_ip=$ngic_sriov
-spgwu_s1u_ip: "119.0.0.83"
+spgwu_s1u_ip: "119.0.0.45"
 spgwu_port: 20
-accelleran_hostname: "10.233.65.254"
+accelleran_hostname: "10.233.65.88"
 
 hss:
   # TODO: init UE's IMEI to DB?
@@ -47,14 +47,15 @@
 mme:
   images:
     init: "ngick8stesting/c3po-mmeinit"
-    mme: "ngick8stesting/c3po-mme:5e2eaf6"
+    #mme: "ngick8stesting/c3po-mme:5e2eaf6"
+    mme: "ngick8stesting/c3po-mme:mwca-mme-debug"
   ports:
     s11: 2123
     s1ap: 36412
     s6a: 3868
     s11_external: 32123
-    s1ap_external: 36412
-    s6a_external: 33868
+    s1ap_external: 31412
+    s6a_external: 30868
   replicas: 1
   enb_s1ap_ip: "119.0.0.10"
   resources: