diff --git a/kubernetes/policy/templates/dep-pypdp.yaml b/kubernetes/policy/templates/dep-pypdp.yaml
index 8514388..4e2c9b6 100644
--- a/kubernetes/policy/templates/dep-pypdp.yaml
+++ b/kubernetes/policy/templates/dep-pypdp.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   name: pypdp
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-policy"
 spec:
   replicas: 1
   selector:
@@ -67,6 +67,6 @@
       volumes:
         - name: pe
           hostPath:
-            path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"