diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index fb4742e..22edcff 100755
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -49,7 +49,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.5.0
+image: onap/policy-apex-pdp:2.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 9d3ea8c..0b2ea9f 100755
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -81,7 +81,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.4.0
+image: onap/policy-api:2.4.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-be/values.yaml b/kubernetes/policy/components/policy-clamp-be/values.yaml
index cd78850..50ec8fa 100644
--- a/kubernetes/policy/components/policy-clamp-be/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/values.yaml
@@ -63,7 +63,7 @@
 flavor: small
 
 # application image
-image: onap/policy-clamp-backend:6.0.1
+image: onap/policy-clamp-backend:6.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-fe/values.yaml b/kubernetes/policy/components/policy-clamp-fe/values.yaml
index 15b69ef..c2f4d15 100644
--- a/kubernetes/policy/components/policy-clamp-fe/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/values.yaml
@@ -62,7 +62,7 @@
 flavor: small
 
 # application image
-image: onap/policy-clamp-frontend:6.0.1
+image: onap/policy-clamp-frontend:6.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 752b83c..09805bd 100755
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -67,7 +67,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.5.0
+image: onap/policy-distribution:2.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 459767e..658fa65 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -34,7 +34,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.8.0
+image: onap/policy-pdpd-cl:1.8.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -86,14 +86,15 @@
   cadi_longitude: "0.0"
   credsPath: /opt/app/osaaf/local
   app_ns: org.osaaf.aaf
-  uid: 1000
-  gid: 1000
+  uid: 100
+  gid: 101
   aaf_add_config: >
     /opt/app/aaf_config/bin/agent.sh;
     export $(/opt/app/aaf_config/bin/agent.sh local showpass
     {{ .Values.fqi }} {{ .Values.fqdn }} | grep "^cadi_keystore_password_p12");
     echo "export KEYSTORE='{{ .Values.credsPath }}/org.onap.policy.p12'" >> {{ .Values.credsPath }}/.ci;
     echo "export KEYSTORE_PASSWD='${cadi_keystore_password_p12}'" >> {{ .Values.credsPath }}/.ci;
+    echo "export CADI_KEYFILE='{{ .Values.credsPath }}/org.onap.policy.keyfile'" >> {{ .Values.credsPath }}/.ci;
     chown -R {{ .Values.uid }}:{{ .Values.gid }} $(dirname {{ .Values.credsPath }});
 
 server:
diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 42f0e13..ec177d8 100755
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -95,7 +95,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.4.0
+image: onap/policy-pap:2.4.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 41bec0b..76b0f3a 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -86,7 +86,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.4.0
+image: onap/policy-xacml-pdp:2.4.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required