diff --git a/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml b/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml
index 6dc9da5..6b6fa2e 100644
--- a/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml
+++ b/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml
@@ -24,6 +24,9 @@ spec:
     - podSelector:
         matchLabels:
           app: eric-pm-server
+    - namespaceSelector:
+        matchLabels:
+          kubernetes.io/metadata.name:  {{ .Values.eic.namespace }}
     ports:
     - protocol: TCP
       port: {{ index .Values.service "http-port" }}
diff --git a/charts/eric-oss-hello-world-python-app/values.yaml b/charts/eric-oss-hello-world-python-app/values.yaml
index 112f0a7..81fe1fe 100644
--- a/charts/eric-oss-hello-world-python-app/values.yaml
+++ b/charts/eric-oss-hello-world-python-app/values.yaml
@@ -130,8 +130,13 @@ instantiationDefaults:
   proxyCaCertMountPath: "/etc/certs/ca"
   proxyAppCertMountPath: "/etc/certs/app"
 
+# Below variables values are populated by App Manager automatically
+
 global:
   clientCredentials:
     secret:
-      clientIdKey: "clientId"
-      name: "<instance id>-cc"
+      clientIdKey:
+      name:
+
+eic:
+  namespace: