diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index 8c6db30..0ae94fc 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -3,7 +3,7 @@
 kind: Service
 metadata:
   name: msb-consul
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: msb-consul
 spec:
@@ -20,7 +20,7 @@
 kind: Service
 metadata:
   name: msb-discovery
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: msb-discovery
 spec:
@@ -38,7 +38,7 @@
 kind: Service
 metadata:
   name: msb-iag
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: msb-iag
 spec:
@@ -59,7 +59,7 @@
 kind: Service
 metadata:
   name: msb-eag
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: msb-eag
 spec:
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index 4d462aa..850dd08 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: msb-consul
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 5c01feb..280e6c3 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: msb-discovery
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.discoveryReplicas }}
   selector:
@@ -37,7 +37,7 @@
         name: "msb-discovery"
         env:
         - name: CONSUL_IP
-          value: msb-consul.{{ .Values.nsPrefix }}-msb
+          value: msb-consul.{{ .Values.nsPrefix }}
         ports:
         - containerPort: {{ .Values.discoveryPort }}
           name: msb-discovery
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index 10cbbe1..a24b3b0 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: msb-eag
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.eagReplicas }}
   selector:
@@ -37,9 +37,9 @@
         name: "msb-eag"
         env:
         - name: CONSUL_IP
-          value:  msb-consul.{{ .Values.nsPrefix }}-msb
+          value:  msb-consul.{{ .Values.nsPrefix }}
         - name: SDCLIENT_IP
-          value:  msb-discovery.{{ .Values.nsPrefix }}-msb
+          value:  msb-discovery.{{ .Values.nsPrefix }}
         - 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 18dbc67..8a56a5f 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: msb-iag
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.iagReplicas }}
   selector:
@@ -37,9 +37,9 @@
         name: "msb-iag"
         env:
         - name: CONSUL_IP
-          value: msb-consul.{{ .Values.nsPrefix }}-msb
+          value: msb-consul.{{ .Values.nsPrefix }}
         - name: SDCLIENT_IP
-          value: msb-discovery.{{ .Values.nsPrefix }}-msb
+          value: msb-discovery.{{ .Values.nsPrefix }}
         - name: ROUTE_LABELS
           value: "visualRange:1"
         ports: