# Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.8.2
+image: onap/policy-apex-pdp:2.9.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
   port: {{ .Values.service.internalPort }}
   ssl:
     enabled: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+  servlet:
+    context-path: /policy/api/v1
 
 spring:
   security.user:
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.7.2
+image: onap/policy-api:2.8.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: A1PMSParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.A1PMSParticipant
-      version: 2.3.4
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement
+        typeVersion: 1.0.1
 
 
 management:
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-a1pms-ppnt:6.4.0
+image: onap/policy-clamp-ac-a1pms-ppnt:6.4.1
 pullPolicy: Always
 
 # application configuration
 
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: "false"
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+        typeVersion: 1.0.0
+
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #    clampAutomationCompositionTopics:
 #      topicSources:
 
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
+{{- if .Values.config.useStrimziKafka }}
+      - command:
+          - /app/ready.py
+        args:
+          - --container-name
+          - message-router
+        env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
+{{- end }}
       - command:
         - sh
         args:
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-http-ppnt:6.3.2
+image: onap/policy-clamp-ac-http-ppnt:6.4.1
 pullPolicy: Always
 
 # application configuration
 
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: K8sParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.KubernetesParticipant
-      version: 2.3.4
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02
     clampAutomationCompositionTopics:
       topicSources:
         -
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: "false"
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
+        typeVersion: 1.0.0
 
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #    clampAutomationCompositionTopics:
 
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
+{{- if .Values.config.useStrimziKafka }}
+      - command:
+          - /app/ready.py
+        args:
+          - --container-name
+          - message-router
+        env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
+{{- end }}
       - command:
         - sh
         args:
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-k8s-ppnt:6.3.2
+image: onap/policy-clamp-ac-k8s-ppnt:6.4.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: org.onap.PM_Policy
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.PolicyParticipant
-      version: 2.3.1
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
     clampAutomationCompositionTopics:
       topicSources:
         -
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: "false"
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
+        typeVersion: 1.0.0
 
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #    clampAutomationCompositionTopics:
 
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
+{{- if .Values.config.useStrimziKafka }}
+      - command:
+          - /app/ready.py
+        args:
+          - --container-name
+          - message-router
+        env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
+{{- end }}
       - command:
         - sh
         args:
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-pf-ppnt:6.3.2
+image: onap/policy-clamp-ac-pf-ppnt:6.4.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-runtime-acm:6.3.2
+image: onap/policy-clamp-runtime-acm:6.4.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.9.0
+image: onap/policy-distribution:2.9.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.11.2
+image: onap/policy-pdpd-cl:1.12.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
 flavor: small
 
 # application image
-image: onap/policy-gui:2.3.2
+image: onap/policy-gui:2.4.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
   port: 6969
   ssl:
     enabled: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+  servlet:
+    context-path: /policy/pap/v1
 
 pap:
   name: PapGroup
   aaf: false
+  topic:
+    pdp-pap.name: POLICY-PDP-PAP
+    notification.name: POLICY-NOTIFICATION
+    heartbeat.name: POLICY-HEARTBEAT
   pdpParameters:
     heartBeatMs: 120000
     updateParameters:
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.7.2
+image: onap/policy-pap:2.8.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.7.2
+image: onap/policy-xacml-pdp:2.8.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
 
 #################################################################
 
 dbmigrator:
-  image: onap/policy-db-migrator:2.5.1
+  image: onap/policy-db-migrator:2.6.1
   schema: policyadmin
   policy_home: "/opt/app/policy"