diff --git a/Makefile b/Makefile
index 1d12c56..d70b5f0 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,9 @@
 	sed -i 's/provision-network-slice: true/provision-network-slice: false/' $(4G_CORE_VALUES)
 	sed -i 's/# syncUrl/syncUrl/' $(4G_CORE_VALUES)
 	if [ "${ENABLE_SUBSCRIBER_PROXY}" == "true" ] ; then \
-		sed -i 's/addr: config4g/addr: subscriber-proxy.aether-roc.svc.cluster.local/' $(4G_CORE_VALUES) ; \
+		sed -i 's/# sub-proxy-endpt:/sub-proxy-endpt:/' $(4G_CORE_VALUES) ; \
+		sed -i 's/#   addr: sub/  addr: sub/' $(4G_CORE_VALUES) ; \
+		sed -i 's/#   port: 5000/  port: 5000/' $(4G_CORE_VALUES) ; \
 	fi
 	$(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
 	echo "ONOS CLI pod: ${ONOS_CLI_POD}"
@@ -272,7 +274,9 @@
 	sed -i 's/provision-network-slice: true/provision-network-slice: false/' $(5G_CORE_VALUES)
 	sed -i 's/# syncUrl/syncUrl/' $(5G_CORE_VALUES)
 	if [ "${ENABLE_SUBSCRIBER_PROXY}" == "true" ] ; then \
-		sed -i 's/addr: webui/addr: subscriber-proxy.aether-roc.svc.cluster.local/' $(5G_CORE_VALUES) ;\
+		sed -i 's/# sub-proxy-endpt:/sub-proxy-endpt:/' $(5G_CORE_VALUES) ; \
+		sed -i 's/#   addr: sub/  addr: sub/' $(5G_CORE_VALUES) ; \
+		sed -i 's/#   port: 5000/  port: 5000/' $(5G_CORE_VALUES) ; \
 	fi
 	$(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
 	echo "ONOS CLI pod: ${ONOS_CLI_POD}"
@@ -285,10 +289,14 @@
 	@echo "This could take 2-3 minutes..."
 	sed -i 's/provision-network-slice: false/provision-network-slice: true/' $(4G_CORE_VALUES)
 	sed -i 's/  syncUrl/  # syncUrl/' $(4G_CORE_VALUES)
-	sed -i 's/subscriber-proxy.aether-roc.svc.cluster.local/config4g/' $(4G_CORE_VALUES)
+	sed -i 's/  sub-proxy-endpt:/  # sub-proxy-endpt:/' $(4G_CORE_VALUES)
+	sed -i 's/    addr: sub/  #   addr: sub/' $(4G_CORE_VALUES)
+	sed -i 's/    port: 5000/  #   port: 5000/' $(4G_CORE_VALUES)
 	sed -i 's/provision-network-slice: false/provision-network-slice: true/' $(5G_CORE_VALUES)
 	sed -i 's/  syncUrl/  # syncUrl/' $(5G_CORE_VALUES)
-	sed -i 's/subscriber-proxy.aether-roc.svc.cluster.local/webui/' $(5G_CORE_VALUES)
+	sed -i 's/  sub-proxy-endpt:/  # sub-proxy-endpt:/' $(5G_CORE_VALUES)
+	sed -i 's/    addr: sub/  #   addr: sub/' $(5G_CORE_VALUES)
+	sed -i 's/    port: 5000/  #   port: 5000/' $(5G_CORE_VALUES)
 	kubectl delete namespace aether-roc || true
 	rm -rf $(M)/roc
 
diff --git a/roc-4g-models.json b/roc-4g-models.json
index 2e99551..e46c2ec 100644
--- a/roc-4g-models.json
+++ b/roc-4g-models.json
@@ -105,12 +105,12 @@
                                 {
                                     "sim-id": "aiab-sim-1",
                                     "display-name": "UE 1 Sim",
-                                    "imsi": 67891201
+                                    "imsi": 208010167891201
                                 },
                                 {
                                     "sim-id": "aiab-sim-2",
                                     "display-name": "UE 2 Sim",
-                                    "imsi": 67891202
+                                    "imsi": 208010167891202
                                 } 
                             ],
                             "device-group": [
diff --git a/roc-5g-models.json b/roc-5g-models.json
index a9c80b7..1cb5810 100644
--- a/roc-5g-models.json
+++ b/roc-5g-models.json
@@ -170,76 +170,76 @@
                                 {
                                     "sim-id": "aiab-sim-1",
                                     "display-name": "UE 1 Sim",
-                                    "imsi": 7487
+                                    "imsi": 208930100007487
                                 },
                                 {
                                     "sim-id": "aiab-sim-2",
                                     "display-name": "UE 2 Sim",
-                                    "imsi": 7488
+                                    "imsi": 208930100007488
                                 },
                                 {
                                     "sim-id": "aiab-sim-3",
                                     "display-name": "UE 3 Sim",
-                                    "imsi": 7489
+                                    "imsi": 208930100007489
                                 },
                                 {
                                     "sim-id": "aiab-sim-4",
                                     "display-name": "UE 4 Sim",
-                                    "imsi": 7490
+                                    "imsi": 208930100007490
                                 },
                                 {
                                     "sim-id": "aiab-sim-5",
                                     "display-name": "UE 5 Sim",
-                                    "imsi": 7491
+                                    "imsi": 208930100007491
                                 },
                                 {
                                     "sim-id": "aiab-sim-6",
                                     "display-name": "UE 6 Sim",
-                                    "imsi": 7492
+                                    "imsi": 208930100007492
                                 },
                                 {
                                     "sim-id": "aiab-sim-7",
                                     "display-name": "UE 7 Sim",
-                                    "imsi": 7493
+                                    "imsi": 208930100007493
                                 },
                                 {
                                     "sim-id": "aiab-sim-8",
                                     "display-name": "UE 8 Sim",
-                                    "imsi": 7494
+                                    "imsi": 208930100007494
                                 },                                {
                                     "sim-id": "aiab-sim-9",
                                     "display-name": "UE 9 Sim",
-                                    "imsi": 7495
+                                    "imsi": 208930100007495
                                 },
                                 {
                                     "sim-id": "aiab-sim-10",
                                     "display-name": "UE 10 Sim",
-                                    "imsi": 7496
+                                    "imsi": 208930100007496
                                 },
                                 {
                                     "sim-id": "aiab-sim-11",
                                     "display-name": "UE 11 Sim",
-                                    "imsi": 7497
+                                    "imsi": 208930100007497
                                 },
                                 {
                                     "sim-id": "aiab-sim-12",
                                     "display-name": "UE 12 Sim",
-                                    "imsi": 7498
+                                    "imsi": 208930100007498
                                 },
                                 {
                                     "sim-id": "aiab-sim-13",
                                     "display-name": "UE 13 Sim",
-                                    "imsi": 7499
+                                    "imsi": 208930100007499
                                 },
                                 {
                                     "sim-id": "aiab-sim-14",
                                     "display-name": "UE 14 Sim",
-                                    "imsi": 7500
+                                    "imsi": 208930100007500
                                 },
                                 {
                                     "sim-id": "aiab-sim-15",
                                     "display-name": "UE 15 Sim",
-                                    "imsi": 7501
+                                    "imsi": 208930100007501
                                 }
                             ],
                             "device-group": [
diff --git a/sd-core-4g-values.yaml b/sd-core-4g-values.yaml
index 9f62fe4..7606f8c 100644
--- a/sd-core-4g-values.yaml
+++ b/sd-core-4g-values.yaml
@@ -43,8 +43,10 @@
           configuration:
             provision-network-slice: true
             sub-provision-endpt:
-              addr: config4g
-              port: 5000
+              addr: config4g.omec.svc.cluster.local
+            # sub-proxy-endpt:
+            #   addr: subscriber-proxy.aether-roc.svc.cluster.local
+            #   port: 5000
             subscribers:
             - ueId-start: 208010167891201
               ueId-end: 208010167891211
diff --git a/sd-core-5g-values.yaml b/sd-core-5g-values.yaml
index a263ae0..41bb51c 100644
--- a/sd-core-5g-values.yaml
+++ b/sd-core-5g-values.yaml
@@ -52,8 +52,10 @@
           configuration:
             provision-network-slice: true
             sub-provision-endpt:
-              addr: webui
-              port: 5000
+              addr: webui.omec.svc.cluster.local
+            # sub-proxy-endpt:
+            #   addr: subscriber-proxy.aether-roc.svc.cluster.local
+            #   port: 5000
             subscribers:
             - ueId-start: 208930100007487
               ueId-end: 208930100007501