3 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml
index 7b23b36808..173fc77ab4 100644
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/templates/all-services.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: uui
   name: uui
-  namespace: "{{ .Values.nsPrefix }}-uui"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -34,7 +34,7 @@ metadata:
   labels:
     app: uui-server
   name: uui-server
-  namespace: "{{ .Values.nsPrefix }}-uui"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml
index db7ac1a9da..1e18009be5 100644
--- a/kubernetes/uui/templates/uui-deployment.yaml
+++ b/kubernetes/uui/templates/uui-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: uui
   name: uui
-  namespace: "{{ .Values.nsPrefix }}-uui"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -26,7 +26,7 @@ spec:
         name: uui
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: 8080
         readinessProbe:
@@ -36,4 +36,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/uui/templates/uui-server-deployment.yaml b/kubernetes/uui/templates/uui-server-deployment.yaml
index 2462a69be1..e3c58a87e6 100644
--- a/kubernetes/uui/templates/uui-server-deployment.yaml
+++ b/kubernetes/uui/templates/uui-server-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: uui-server
   name: uui-server
-  namespace: "{{ .Values.nsPrefix }}-uui"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -22,9 +22,9 @@ spec:
         name: uui-server
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{tpl .Values.msbaddr .}}
         - name: MR_ADDR
-          value: {{ .Values.mraddr }}
+          value: {{tpl .Values.mraddr .}}
         ports:
         - containerPort: 8082
         readinessProbe:
@@ -34,4 +34,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-\ No newline at end of file
+#{{ end }}