diff --git a/mcord/mcord-control-plane/templates/cp.yaml b/mcord/mcord-control-plane/templates/cp.yaml
index dab5aeb..563336f 100644
--- a/mcord/mcord-control-plane/templates/cp.yaml
+++ b/mcord/mcord-control-plane/templates/cp.yaml
@@ -66,15 +66,15 @@
         stdin: true
         command: [ "bash",  "-xc"]
         args:
-        - . /opt/ngic/config/cp_config.cfg;
+        - export HOSTIP=$(ip route get 1 | awk '{print $NF;exit}');
+          echo "$HOSTIP" > /opt/ngic/config/shared/SGW_S1U_IP;
+          . /opt/ngic/config/cp_config.cfg;
           sleep 20;
           ./ngic_controlplane $EAL_ARGS -- $APP_ARGS;
         tty: true
         env:
         - name: MME_S11_IP
           value: {{ .Values.mme_hostname }}
-        #- name: SGW_S1U_IP  # for now,this will be in our own pod
-        #  value: "5.5.5.5"
         - name: APN
           value: {{ .Values.ngic_cp.config.apn }}
         - name: IP_POOL_IP
diff --git a/mcord/mcord-control-plane/templates/hss.yaml b/mcord/mcord-control-plane/templates/hss.yaml
index 40b8f75..dd3fb88 100644
--- a/mcord/mcord-control-plane/templates/hss.yaml
+++ b/mcord/mcord-control-plane/templates/hss.yaml
@@ -52,25 +52,21 @@
         command: ["bash", "-xc"]
         args:
         - until nslookup {{ .Values.hssdb_hostname }}; do echo waiting for cassandra; sleep 2; done;
-          sleep 5;
+          sleep 10;
           cqlsh --file /scripts/oai_db.cql cassandra;
           /scripts/data_provisioning_users.sh 302720100000421 1122334456 apn1 6226194254742F2D67145153602F7C8D 1 cassandra {{ .Values.mme_hostname }} {{ .Values.mme_hostname }};
           cqlsh -e "use vhss; update users_imsi set opc='D6CAF10C337FD65AC31A18EBACBF5BF9' where imsi='302720100000421';" cassandra;
-          cqlsh -e "select imsi,key,opc,sqn from vhss.users_imsi;" cassandra;
-          /scripts/data_provisioning_mme.sh 1 19136246000 {{ .Values.mme_hostname }} {{ .Values.mme_hostname }} 1 cassandra;
+          /scripts/data_provisioning_mme.sh 1 19136246000 mme-0.{{ .Values.mme_hostname }}.{{ .Values.namespace }}.svc.cluster.local {{ .Values.mme_hostname }}.{{ .Values.namespace }}.svc.cluster.local 1 cassandra;
           /scripts/data_provisioning_mme.sh 1 19136246000 smsrouter.test3gpp.net test3gpp.net 0  cassandra;
       containers:
       - name: hss
         image: {{ .Values.hss.images.hss }}
         imagePullPolicy: Always
-        command: ["bash", "-xc"]
-        args:
-        - sleep 3600;
         env:
           - name: CASSANDRA_ADDR
-            value: cassandra
+            value: {{ .Values.hssdb_hostname }}
           - name: MME_ADDR
-            value: {{ .Values.mme_hostname }}
+            value: mme-0.{{ .Values.mme_hostname }}.{{ .Values.namespace }}.svc.cluster.local
         #command: [ "sleep", "3600"]
         resources:
           limits:
diff --git a/mcord/mcord-control-plane/templates/mme.yaml b/mcord/mcord-control-plane/templates/mme.yaml
index 476265a..ad28806 100644
--- a/mcord/mcord-control-plane/templates/mme.yaml
+++ b/mcord/mcord-control-plane/templates/mme.yaml
@@ -80,11 +80,11 @@
           - name: ENB_S1AP_PORT
             value: "{{ .Values.mme.ports.s1ap }}"   #ng4t uses 32767
           - name: CONNECT_PEER
-            value: {{ .Values.hss_hostname }}
+            value: hss-0.{{ .Values.hss_hostname }}.{{ .Values.namespace }}.svc.cluster.local
           - name: VAR_HSS_REALM
-            value: {{ .Values.hss_hostname }}
+            value: {{ .Values.hss_hostname }}.{{ .Values.namespace }}.svc.cluster.local
           - name: HSS_S6A_IP
-            value: {{ .Values.hss_hostname }}
+            value: hss-0.{{ .Values.hss_hostname }}.{{ .Values.namespace }}.svc.cluster.local
           - name: HSS_PORT
             value: "{{ .Values.mme.ports.s6a }}"
         stdin: true