diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index db703d9..8a250fe 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -23,7 +23,7 @@
         - name: CONSUL_IP
           value:  msb-consul.{{ .Values.nsPrefix }}-msb
         - name: SDCLIENT_IP
-          value: "{{ .Values.discoveryClusterIP}}"
+          value:  msb-discovery.{{ .Values.nsPrefix }}-msb
         - name: ROUTE_LABELS
           value: "visualRange:0"
         ports:
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index 35fba56..251ca5e 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -23,7 +23,7 @@
         - name: CONSUL_IP
           value: msb-consul.{{ .Values.nsPrefix }}-msb
         - name: SDCLIENT_IP
-          value: "{{ .Values.discoveryClusterIP}}"
+          value: msb-discovery.{{ .Values.nsPrefix }}-msb
         - name: ROUTE_LABELS
           value: "visualRange:1"
         ports:
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 8c15338..d78a336 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -8,8 +8,6 @@
 consulPort: 8500
 consulNodePort: 30500
 
-# Should remove cluster IP after domain name is supported by API gateway
-discoveryClusterIP: 10.43.6.205
 discoveryPort: 10081
 discoveryNodePort: 30081
 discoveryReplicas: 1