3 files changed, 8 insertions, 8 deletions
diff --git a/kubernetes/esr/templates/all-services.yaml b/kubernetes/esr/templates/all-services.yaml
index 68f0db7516..e0c5075e50 100644
--- a/kubernetes/esr/templates/all-services.yaml
+++ b/kubernetes/esr/templates/all-services.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: esr-esrserver
   name: esr-esrserver
-  namespace: "{{ .Values.nsPrefix }}-esr"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -32,7 +32,7 @@ metadata:
   labels:
     app: esr-esrgui
   name: esr-esrgui
-  namespace: "{{ .Values.nsPrefix }}-esr"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
diff --git a/kubernetes/esr/templates/esr-esrgui-deployment.yaml b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
index 6c3ddf404d..f9ec271515 100644
--- a/kubernetes/esr/templates/esr-esrgui-deployment.yaml
+++ b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: esr-esrgui
   name: esr-esrgui
-  namespace: "{{ .Values.nsPrefix }}-esr"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -22,7 +22,7 @@ spec:
         name: esr-esrgui
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.esrgui.port }}
         readinessProbe:
@@ -32,4 +32,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/esr/templates/esr-esrserver-deployment.yaml b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
index 7724fa0d24..386d4014e4 100644
--- a/kubernetes/esr/templates/esr-esrserver-deployment.yaml
+++ b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: esr-esrserver
   name: esr-esrserver
-  namespace: "{{ .Values.nsPrefix }}-esr"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -22,7 +22,7 @@ spec:
         name: esr-esrserver
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.esrserver.port }}
         readinessProbe:
@@ -32,4 +32,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-\ No newline at end of file
+#{{ end }}