diff --git a/kubernetes/dcae/templates/all-services.yaml b/kubernetes/dcae/templates/all-services.yaml
index b017073..9423e43 100644
--- a/kubernetes/dcae/templates/all-services.yaml
+++ b/kubernetes/dcae/templates/all-services.yaml
@@ -3,7 +3,7 @@
 kind: Service
 metadata:
   name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: zookeeper
 spec:
@@ -20,7 +20,7 @@
 kind: Service
 metadata:
   name: kafka
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: kafka
 spec:
@@ -37,7 +37,7 @@
 kind: Service
 metadata:
   name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: dmaap
     version: 1.1.0
@@ -60,7 +60,7 @@
 kind: Service
 metadata:
   name: zldciad4vipstg00
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: dcae-pgaas
 spec:
@@ -82,7 +82,7 @@
     app: dcae-collector-common-event
     version: latest
   name: dcae-collector-common-event
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: dcae-ce1
@@ -110,7 +110,7 @@
     app: dcae-collector-dmaapbc
     version: latest
   name: dcae-collector-dmaapbc
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: dcae-bc1
diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml
index 37d7d58..208e1ef 100644
--- a/kubernetes/dcae/templates/cdap0-dep.yaml
+++ b/kubernetes/dcae/templates/cdap0-dep.yaml
@@ -7,7 +7,7 @@
   labels:
     app: cdap0
   name: cdap0
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml
index 7529777..8aa7721 100644
--- a/kubernetes/dcae/templates/cdap1-dep.yaml
+++ b/kubernetes/dcae/templates/cdap1-dep.yaml
@@ -7,7 +7,7 @@
   labels:
     app: cdap1
   name: cdap1
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml
index d146894..119b8ff 100644
--- a/kubernetes/dcae/templates/cdap2-dep.yaml
+++ b/kubernetes/dcae/templates/cdap2-dep.yaml
@@ -7,7 +7,7 @@
   labels:
     app: cdap2
   name: cdap2
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/dcae/templates/dcae-collector-common-event.yaml b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
index aa51f14..a370151 100644
--- a/kubernetes/dcae/templates/dcae-collector-common-event.yaml
+++ b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: dcae-collector-common-event
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -37,4 +37,4 @@
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/common-event/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
index 5de893b..85f671e 100644
--- a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
+++ b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: dcae-collector-dmaapbc
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -36,4 +36,4 @@
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dmaapbc/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-controller.yaml b/kubernetes/dcae/templates/dcae-controller.yaml
index 30f3afb..e4642c9 100644
--- a/kubernetes/dcae/templates/dcae-controller.yaml
+++ b/kubernetes/dcae/templates/dcae-controller.yaml
@@ -6,7 +6,7 @@
     app: dcae-controller
     version: latest
   name: dcae-controller
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: dcae-con1
@@ -27,7 +27,7 @@
 kind: Deployment
 metadata:
   name: dcae-controller
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -60,4 +60,4 @@
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dcae-controller/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml
index 46c2e65..8545311 100644
--- a/kubernetes/dcae/templates/dcae-dmaap.yaml
+++ b/kubernetes/dcae/templates/dcae-dmaap.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml
index de18137..d265272 100644
--- a/kubernetes/dcae/templates/dcae-kafka.yaml
+++ b/kubernetes/dcae/templates/dcae-kafka.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: kafka
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -42,7 +42,7 @@
           periodSeconds: 10
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.{{ .Values.nsPrefix }}-dcae:2181"
+          value: "zookeeper.{{ .Values.nsPrefix }}"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "kafka"
         - name: KAFKA_BROKER_ID
diff --git a/kubernetes/dcae/templates/dcae-zookeeper.yaml b/kubernetes/dcae/templates/dcae-zookeeper.yaml
index 189a039..9c2d8c7 100644
--- a/kubernetes/dcae/templates/dcae-zookeeper.yaml
+++ b/kubernetes/dcae/templates/dcae-zookeeper.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -30,4 +30,4 @@
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/dcae/templates/pgaas.yaml b/kubernetes/dcae/templates/pgaas.yaml
index 788de60..16abade 100644
--- a/kubernetes/dcae/templates/pgaas.yaml
+++ b/kubernetes/dcae/templates/pgaas.yaml
@@ -7,7 +7,7 @@
   labels:
     app: dcae-pgaas
   name: dcae-pgaas
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: 1
   selector:
@@ -46,4 +46,4 @@
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/tools
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}