diff --git a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml
index f316b86..89c6932 100644
--- a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml
@@ -21,7 +21,7 @@
   #List of logstash server ip addresses with port number.
   #But, in our case, this will be the loadbalancer IP address.
   #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
-  hosts: ["logstash.onap-log:5044"]
+  hosts: ["logstash.{{.Values.nsPrefix}}:5044"]
   #If enable will do load balancing among availabe Logstash, automatically.
   loadbalance: true
 
diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
index 4871b42..6c89f60 100755
--- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
@@ -16,7 +16,7 @@
 ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9
 ueb_app_mailbox_name = ECOMP-PORTAL-INBOX
 
-ueb_url_list = dmaap.onap-message-router
+ueb_url_list = dmaap.{{.Values.nsPrefix}}
 ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX
 
 # Consumer group name for UEB topic.
diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties
index 9085cee..345d222 100755
--- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties
@@ -1,6 +1,6 @@
 #mysql
 db.driver = org.mariadb.jdbc.Driver
-db.connectionURL = jdbc:mariadb:failover://portaldb.onap-portal:3306/portal
+db.connectionURL = jdbc:mariadb:failover://portaldb.{{.Values.nsPrefix}}:3306/portal
 db.userName =root
 db.password =Aa123456
 db.hib.dialect = org.hibernate.dialect.MySQLDialect
@@ -84,7 +84,7 @@
 
 #Microservices Related Properties for Portal
 microservices.widget.protocol = http
-microservices.widget.hostname = portalwidgets.onap-portal
+microservices.widget.hostname = portalwidgets.{{.Values.nsPrefix}}
 microservices.widget.username = widget_user
 microservices.widget.password = KpuqIB08YHg+btG+pjX+sA==
 #This property won't be needed after consul is functional on VMs -
diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
index e77a701..7eeb913 100755
--- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
@@ -30,7 +30,7 @@
 ueb_listeners_enable = false
 
 # UEB Configuration
-ueb_url_list = dmaap.onap-message-router
+ueb_url_list = dmaap.{{.Values.nsPrefix}}
 # ECOMP Portal listens on this UEB topic
 ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX
 # Replace these 3 default values with the ones for your specific App,
diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
index d638abc..2f53286 100755
--- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
@@ -24,7 +24,7 @@
 ##########################################################################
 
 db.driver = org.mariadb.jdbc.Driver
-db.connectionURL = jdbc:mariadb://portaldb.onap-portal:3306/ecomp_sdk
+db.connectionURL = jdbc:mariadb://portaldb.{{.Values.nsPrefix}}:3306/ecomp_sdk
 db.userName = root
 db.password = Aa123456
 db.min_pool_size = 5
@@ -61,4 +61,4 @@
 guard_notebook_url=
 
 #authenticate user server
-authenticate_user_server=http://portalapps.onap-portal:8383/openid-connect-server-webapp/allUsers
+authenticate_user_server=http://portalapps.{{.Values.nsPrefix}}:8383/openid-connect-server-webapp/allUsers
diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
index a5e55dc..3450a6d 100644
--- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
@@ -6,7 +6,7 @@
 microservice.widget.location=/tmp
 
 ## App DB Properties
-spring.datasource.url=jdbc:mysql://portaldb.onap-portal:3306/portal
+spring.datasource.url=jdbc:mysql://portaldb.{{.Values.nsPrefix}}:3306/portal
 spring.datasource.username=root
 spring.datasource.password=Aa123456
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
index 28ca030..b676e3c 100644
--- a/kubernetes/portal/templates/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -3,7 +3,7 @@
 kind: Service
 metadata:
   name: portaldb
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: portaldb
 spec:
@@ -22,7 +22,7 @@
   labels:
     app: portalapps
   name: portalapps
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -58,9 +58,9 @@
 kind: Service
 metadata:
   labels:
-    app: vnc-portal
-  name: vnc-portal
-  namespace: "{{ .Values.nsPrefix }}-portal"
+    app: portal-vnc
+  name: portal-vnc
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: tcp-1
@@ -72,7 +72,7 @@
     targetPort: 5900
     nodePort: {{ .Values.nodePortPrefix }}12
   selector:
-    app: vnc-portal
+    app: portal-vnc
   type: NodePort
 #{{ end }}
 #{{ if not .Values.disablePortalPortalwidgets }}
@@ -81,7 +81,7 @@
 kind: Service
 metadata:
   name: portalwidgets
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: portalwidgets
 spec:
@@ -91,4 +91,4 @@
   selector:
     app: portalwidgets
   clusterIP: None
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/portal/templates/portal-apps-configmap.yaml b/kubernetes/portal/templates/portal-apps-configmap.yaml
index 044e0d8..ec3805d 100644
--- a/kubernetes/portal/templates/portal-apps-configmap.yaml
+++ b/kubernetes/portal/templates/portal-apps-configmap.yaml
@@ -3,7 +3,7 @@
 kind: ConfigMap
 metadata:
   name: portal-onap-portal-sdk-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/*").AsConfig . | indent 2 }}
 ---
@@ -11,7 +11,7 @@
 kind: ConfigMap
 metadata:
   name: portal-onap-portal-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTAL/*").AsConfig . | indent 2 }}
 ---
@@ -19,7 +19,7 @@
 kind: ConfigMap
 metadata:
   name: portal-mariadb-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/mariadb/oom_updates.sql").AsConfig . | indent 2 }}
 #{{ end }}
@@ -29,7 +29,7 @@
 kind: ConfigMap
 metadata:
   name: portal-onapwidgetms-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 068e0f7..e00151c 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: portalapps
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-apps
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.portalAppsReplicas }}
   selector:
@@ -13,7 +13,7 @@
     metadata:
        labels:
          app: portalapps
-       name: portalapps
+       name: portal-apps
     spec:
       initContainers:
       - command:
diff --git a/kubernetes/portal/templates/portal-logs-configmap.yaml b/kubernetes/portal/templates/portal-logs-configmap.yaml
index c5735ba..60abcb7 100644
--- a/kubernetes/portal/templates/portal-logs-configmap.yaml
+++ b/kubernetes/portal/templates/portal-logs-configmap.yaml
@@ -3,7 +3,7 @@
 kind: ConfigMap
 metadata:
   name: portal-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/filebeat.yml").AsConfig . | indent 2 }}
 ---
@@ -11,7 +11,7 @@
 kind: ConfigMap
 metadata:
   name: portal-onapportal-log-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/portal/onapportal/logback.xml").AsConfig . | indent 2 }}
 ---
@@ -19,7 +19,7 @@
 kind: ConfigMap
 metadata:
   name: portal-onapportalsdk-log-configmap
-  namespace: {{ .Values.nsPrefix }}-portal
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/portal/onapportalsdk/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index 9db512a..828779e 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: portaldb
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-db
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.portalDbReplicas }}
   selector:
@@ -13,7 +13,7 @@
     metadata:
       labels:
         app: portaldb
-      name: portaldb
+      name: portal-db
     spec:
       containers:
       - image: {{ .Values.image.portaldb}}
@@ -21,7 +21,7 @@
         name: "portaldb"
         env:
         - name: MYSQL_HOST
-          value: "portaldb.{{ .Values.nsPrefix }}-portal"
+          value: "portaldb.{{ .Values.nsPrefix }}"
         - name: MYSQL_ROOT_PASSWORD
           value: Aa123456
         volumeMounts:
diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml
index 0fabc4c..1f554bc 100644
--- a/kubernetes/portal/templates/portal-pv-pvc.yaml
+++ b/kubernetes/portal/templates/portal-pv-pvc.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: "{{ .Values.nsPrefix }}-portal-db"
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: "{{ .Values.nsPrefix }}-portal-db"
+    name: "{{ .Values.nsPrefix }}-portal"
 spec:
   capacity:
     storage: 2Gi
@@ -19,7 +19,7 @@
 apiVersion: v1
 metadata:
   name: portal-db
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -28,5 +28,5 @@
       storage: 2Gi
   selector:
     matchLabels:
-      name: "{{ .Values.nsPrefix }}-portal-db"
+      name: "{{ .Values.nsPrefix }}-portal"
 #{{ end }}
diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
index 3a80572..0680a8a 100644
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -1,16 +1,16 @@
 #{{ if not .Values.disablePortalVncPortal }}
 kind: ConfigMap
 metadata:
-  name: vnc-profiles-ini
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-vnc-profiles-ini
+  namespace: "{{ .Values.nsPrefix }}"
 data:
 {{ (.Files.Glob "resources/vnc/init_profile/profiles.ini").AsConfig | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: vnc-update-hosts
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-vnc-update-hosts
+  namespace: "{{ .Values.nsPrefix }}"
 data:
 {{ (.Files.Glob "resources/scripts/update_hosts.sh").AsConfig | indent 2 }}
 ---
@@ -18,19 +18,19 @@
 kind: Deployment
 metadata:
   labels:
-    app: vnc-portal
-  name: vnc-portal
-  namespace: "{{ .Values.nsPrefix }}-portal"
+    app: portal-vnc
+  name: portal-vnc
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vncPortalReplicas }}
   selector:
     matchLabels:
-      app: vnc-portal
+      app: portal-vnc
   template:
     metadata:
       labels:
-        app: vnc-portal
-      name: vnc-portal
+        app: portal-vnc
+      name: portal-vnc
     spec:
       initContainers:
       - command:
@@ -46,7 +46,7 @@
               fieldPath: metadata.namespace
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
-        name: vnc-portal-readiness
+        name: portal-vnc-readiness
       - command:
         - /root/ready.py
         args:
@@ -54,7 +54,7 @@
         - pap
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-policy
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vnc-pap-readiness
@@ -65,7 +65,7 @@
         - sdc-fe
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-sdc
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vnc-sdc-readiness
@@ -76,7 +76,7 @@
         - vid-server
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-vid
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vnc-vid-readiness
@@ -86,11 +86,11 @@
         lifecycle:
           postStart:
             exec:
-              command: ["/bin/sh", "-c", "mkdir -p /root/.mozilla/firefox/onap.default; cp /root/.init_profile/profiles.ini /root/.mozilla/firefox/; echo 'user_pref(\"browser.tabs.remote.autostart.2\", false);' > /root/.mozilla/firefox/onap.default/prefs.js; (while true; do /tmp/update_hosts.sh sdc-be.{{ .Values.nsPrefix }}-sdc sdc.api.be.simpledemo.onap.org; /tmp/update_hosts.sh portalapps.{{ .Values.nsPrefix }}-portal portal.api.simpledemo.onap.org; /tmp/update_hosts.sh pap.{{ .Values.nsPrefix }}-policy policy.api.simpledemo.onap.org; /tmp/update_hosts.sh sdc-fe.{{ .Values.nsPrefix }}-sdc sdc.api.simpledemo.onap.org; /tmp/update_hosts.sh vid-server.{{ .Values.nsPrefix }}-vid vid.api.simpledemo.onap.org; /tmp/update_hosts.sh sparky-be.{{ .Values.nsPrefix }}-aai aai.api.simpledemo.onap.org; /tmp/update_hosts.sh cli.{{ .Values.nsPrefix }}-cli cli.api.simpledemo.onap.org; sleep 10; done)  > update_hosts.log 2>&1 &"]
+              command: ["/bin/sh", "-c", "mkdir -p /root/.mozilla/firefox/onap.default; cp /root/.init_profile/profiles.ini /root/.mozilla/firefox/; echo 'user_pref(\"browser.tabs.remote.autostart.2\", false);' > /root/.mozilla/firefox/onap.default/prefs.js; (while true; do /tmp/update_hosts.sh sdc-be.{{ .Values.nsPrefix }} sdc.api.be.simpledemo.onap.org; /tmp/update_hosts.sh portalapps.{{ .Values.nsPrefix }} portal.api.simpledemo.onap.org; /tmp/update_hosts.sh pap.{{ .Values.nsPrefix }} policy.api.simpledemo.onap.org; /tmp/update_hosts.sh sdc-fe.{{ .Values.nsPrefix }} sdc.api.simpledemo.onap.org; /tmp/update_hosts.sh vid-server.{{ .Values.nsPrefix }} vid.api.simpledemo.onap.org; /tmp/update_hosts.sh sparky-be.{{ .Values.nsPrefix }} aai.api.simpledemo.onap.org; /tmp/update_hosts.sh cli.{{ .Values.nsPrefix }} cli.api.simpledemo.onap.org; sleep 10; done)  > update_hosts.log 2>&1 &"]
         env:
         - name: VNC_PASSWORD
           value: password
-        name: vnc-portal
+        name: portal-vnc
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -110,10 +110,10 @@
             path: /etc/localtime
         - name: vnc-profiles-ini
           configMap:
-            name: vnc-profiles-ini
+            name: portal-vnc-profiles-ini
         - name: vnc-update-hosts
           configMap:
-            name: vnc-update-hosts
+            name: portal-vnc-update-hosts
             defaultMode: 0755
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
index 6f27ef6..d5237ca 100644
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: portalwidgets
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-widgets
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.portalWidgetsReplicas }}
   selector:
@@ -13,7 +13,7 @@
     metadata:
        labels:
          app: portalwidgets
-       name: portalwidgets
+       name: portal-widgets
     spec:
       initContainers:
       - command: