diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index ff9eea4..36a8d99 100755
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -5,7 +5,7 @@
   labels:
     app: vfc-nslcm
   name: vfc-nslcm
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -34,7 +34,7 @@
   labels:
     app: vfc-resmgr
   name: vfc-resmgr
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -63,7 +63,7 @@
   labels:
     app: vfc-gvnfmdriver
   name: vfc-gvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -92,7 +92,7 @@
   labels:
     app: vfc-ztevnfmdriver
   name: vfc-ztevnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -121,7 +121,7 @@
   labels:
     app: vfc-nokiavnfmdriver
   name: vfc-nokiavnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -150,7 +150,7 @@
   labels:
     app: vfc-hwvnfmdriver
   name: vfc-hwvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -179,7 +179,7 @@
   labels:
     app: vfc-ztesdncdriver
   name: vfc-ztesdncdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -208,7 +208,7 @@
   labels:
     app: vfc-jujudriver
   name: vfc-jujudriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -237,7 +237,7 @@
   labels:
     app: vfc-vnflcm
   name: vfc-vnflcm
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -266,7 +266,7 @@
   labels:
     app: vfc-vnfres
   name: vfc-vnfres
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -295,7 +295,7 @@
   labels:
     app: vfc-vnfmgr
   name: vfc-vnfmgr
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -324,7 +324,7 @@
   labels:
     app: vfc-emsdriver
   name: vfc-emsdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -353,7 +353,7 @@
   labels:
     app: vfc-workflow
   name: vfc-workflow
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -382,7 +382,7 @@
   labels:
     app: vfc-workflowengineactiviti
   name: vfc-workflowengineactiviti
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -411,7 +411,7 @@
   labels:
     app: vfc-catalog
   name: vfc-catalog
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
diff --git a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml
index 1782e24..0384fef 100755
--- a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-catalog
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.catalog.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-catalog"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.catalog.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml
index 6adc0dc..548bbe7 100755
--- a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-emsdriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.emsdriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-emsdriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.emsdriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml
index 18558af..02093ce 100755
--- a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-gvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.gvnfmdriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-gvnfmdriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.gvnfmdriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml
index e9d3282..9b73626 100755
--- a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-hwvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.hwvnfmdriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-hwvnfmdriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.hwvnfmdriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml
index 28a3c1e..127612b 100755
--- a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-jujudriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.jujudriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-jujudriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.jujudriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
index 9a648ca..4925d1c 100755
--- a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-nokiavnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.nokiavnfmdriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-nokiavnfmdriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.nokiavnfmdriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml
index 400a680..618968d 100755
--- a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-nslcm
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.nslcm.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-nslcm"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.nslcm.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml
index 2c6a895..a6e8125 100755
--- a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-resmgr
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.resmgr.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-resmgr"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.resmgr.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
index 0d89229..ef4793d 100755
--- a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-vnflcm
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vnflcm.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-vnflcm"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.vnflcm.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml
index 566c3ca..e3eb750 100755
--- a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-vnfmgr
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vnfmgr.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-vnfmgr"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.vnfmgr.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml
index 50b52b1..34f2595 100755
--- a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-vnfres
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vnfres.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-vnfres"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.vnfres.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
index f19b55f..c2a8205 100755
--- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-workflow
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.workflow.replicas }}
   selector:
@@ -28,7 +28,7 @@
         - name: SERVICE_PORT
           value: "{{ .Values.workflow.port }}"
         - name: OPENPALETTE_MSB_IP
-          value: msb-iag.{{ .Values.nsPrefix }}-msb
+          value: msb-iag.{{ .Values.nsPrefix }}
         - name: OPENPALETTE_MSB_PORT
           value: "80"
         ports:
@@ -41,4 +41,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
index cb18ada..d224815 100755
--- a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
+++ b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-workflowengineactiviti
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.workflowengineactiviti.replicas }}
   selector:
@@ -28,7 +28,7 @@
         - name: SERVICE_PORT
           value: "{{ .Values.workflow.port }}"
         - name: OPENPALETTE_MSB_IP
-          value: msb-iag.{{ .Values.nsPrefix }}-msb
+          value: msb-iag.{{ .Values.nsPrefix }}
         - name: OPENPALETTE_MSB_PORT
           value: "80"
         ports:
@@ -41,4 +41,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml
index 828e7b3..9eae385 100755
--- a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-ztesdncdriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.ztesdncdriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-ztesdncdriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.ztesdncdriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
index aed359e..e79a27e 100755
--- a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-ztevnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.ztevnfmdriver.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-ztevnfmdriver"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.ztevnfmdriver.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}