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