diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml
index 598fc0f..79983eb 100644
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/templates/hbase-deployment.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   name: hbase
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-aai"
 spec:
   selector:
     matchLabels:
@@ -26,4 +26,4 @@
           initialDelaySeconds: 5
           periodSeconds: 10
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"