diff --git a/Makefile b/Makefile
index 238d80b..4a2f024 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@
 DOCKER_VERSION	?= '20.10'
 K8S_VERSION	?= v1.20.11
 HELM_VERSION	?= v3.6.3
+ENABLE_SUBSCRIBER_PROXY ?= false
 
 HELM_GLOBAL_ARGS ?=
 
@@ -275,6 +276,9 @@
 roc-4g-models: $(M)/roc
 	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/config4g/subscriber-proxy.aether-roc.svc.cluster.local/' $(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}"
 	until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
@@ -286,6 +290,9 @@
 roc-5g-models: $(M)/roc
 	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/webui/subscriber-proxy.aether-roc.svc.cluster.local/' $(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}"
 	until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
@@ -297,8 +304,10 @@
 	@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/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)
 	kubectl delete namespace aether-roc || true
 	rm -rf $(M)/roc