diff --git a/kubernetes/multicloud/templates/all-services.yaml b/kubernetes/multicloud/templates/all-services.yaml
index 09a90d0..58e67e0 100644
--- a/kubernetes/multicloud/templates/all-services.yaml
+++ b/kubernetes/multicloud/templates/all-services.yaml
@@ -3,7 +3,7 @@
 kind: Service
 metadata:
   name: framework
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: framework
   annotations:
@@ -32,7 +32,7 @@
 kind: Service
 metadata:
   name: multicloud-vio
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: multicloud-vio
   annotations:
@@ -62,7 +62,7 @@
 kind: Service
 metadata:
   name: multicloud-ocata
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: multicloud-ocata
   annotations:
@@ -92,7 +92,7 @@
 kind: Service
 metadata:
   name: multicloud-windriver
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: multicloud-windriver
   annotations:
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index f585b04..dcdf0a2 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: framework
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  name: multicloud-framework
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -12,17 +12,17 @@
     metadata:
       labels:
         app: framework
-      name: framework
+      name: multicloud-framework
     spec:
      hostname: framework
      containers:
      - env:
        - name: MSB_ADDR
-         value: {{ .Values.msbgateway }}
+         value: {{ tpl .Values.msbgateway . }}
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ .Values.nsPrefix }}-aai
+         value: aai-service.{{ .Values.nsPrefix }}
        - name: AAI_PORT
          value: "8443"
        - name: AAI_SCHEMA_VERSION
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index 9999b55..a8bc983 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: multicloud-ocata
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -18,11 +18,11 @@
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         value: "{{ tpl .Values.msbgateway . }}"
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ .Values.nsPrefix }}-aai
+         value: aai-service.{{ .Values.nsPrefix }}
        - name: AAI_PORT
          value: "8443"
        - name: AAI_SCHEMA_VERSION
diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index c5efdae..df99542 100644
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: multicloud-vio
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -18,11 +18,11 @@
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         value: "{{ tpl .Values.msbgateway . }}"
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ .Values.nsPrefix }}-aai
+         value: aai-service.{{ .Values.nsPrefix }}
        - name: AAI_PORT
          value: "8443"
        - name: AAI_SCHEMA_VERSION
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index c482aea..2298bee 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: multicloud-windriver
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -18,11 +18,11 @@
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         value: "{{ tpl .Values.msbgateway . }}"
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ .Values.nsPrefix }}-aai
+         value: aai-service.{{ .Values.nsPrefix }}
        - name: AAI_PORT
          value: "8443"
        - name: AAI_SCHEMA_VERSION
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 5d9144a..2dc24b2 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -10,5 +10,5 @@
   windriver: nexus3.onap.org:10001/onap/multicloud/openstack-windriver:v1.0.0
 
 # domain name of msb gateway
-msbgateway: msb-iag.onap-msb
+msbgateway: msb-iag.{{ .Values.nsPrefix }}
 msbPort: 80