diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml
index c2b3af3..eeea35b 100644
--- a/csit/docker-compose-all.yml
+++ b/csit/docker-compose-all.yml
@@ -236,56 +236,74 @@
         'pap', '6969',
         'apex-pdp', '6969'
         ]
-   policy-controlloop-runtime:
-      image: onap/policy-controlloop-runtime:latest
-      container_name: policy-controlloop-runtime
+   policy-clamp-cl-runtime:
+      image: onap/policy-clamp-cl-runtime:latest
+      container_name: policy-clamp-cl-runtime
       depends_on:
        - mariadb
        - simulator
-       - policy-participant
-       - dcae-participant
-      hostname: policy-controlloop-runtime
+       - policy-clamp-cl-http-ppnt
+       - policy-clamp-cl-k8s-ppnt
+       - policy-clamp-cl-pf-ppnt
+      hostname: policy-clamp-cl-runtime
       expose:
-       - 6970
+       - 6969
       volumes:
-       - ./config/clamp/ClRuntimeParameters.json:/opt/app/policy/clamp/etc/ClRuntimeParameters.json:ro
-       - ./config/policy-truststore:/opt/app/policy/api/etc/ssl/policy-truststore:ro
+       - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
       entrypoint: /opt/app/policy/bin/wait_for_port.sh
       command: [
         '-c', './controlloop-runtime.sh',
         'message-router', '3905'
         ]
-   dcae-participant:
-      image: onap/dcae-participant:latest
-      container_name: dcae-participant
+   policy-clamp-cl-http-ppnt:
+      image: onap/policy-clamp-cl-http-ppnt:latest
+      container_name: policy-clamp-cl-http-ppnt
       depends_on:
        - simulator
-      hostname: dcae-participant
+      hostname: policy-clamp-cl-http-ppnt
       expose:
        - 6971
       volumes:
-       - ./config/clamp/DcaeParticipantParameters.json:/opt/app/policy/clamp/etc/DcaeParticipantParameters.json:ro
-       - ./config/policy-truststore:/opt/app/policy/api/etc/ssl/policy-truststore:ro
+       - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
       entrypoint: /opt/app/policy/bin/wait_for_port.sh
       command: [
-        '-c', './dcae-participant.sh',
+        '-c', './http-participant.sh',
         'message-router', '3905'
         ]
-   policy-participant:
-      image: onap/policy-participant:latest
-      container_name: policy-participant
+   policy-clamp-cl-k8s-ppnt:
+      image: onap/policy-clamp-cl-k8s-ppnt:latest
+      container_name: policy-clamp-cl-k8s-ppnt
       depends_on:
        - simulator
-       - api
-      hostname: policy-participant
+      hostname: policy-clamp-cl-k8s-ppnt
       expose:
        - 6972
       volumes:
-       - ./config/clamp/PolicyParticipantParameters.json:/opt/app/policy/clamp/etc/PolicyParticipantParameters.json:ro
-       - ./config/policy-truststore:/opt/app/policy/api/etc/ssl/policy-truststore:ro
+       - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
+      entrypoint: /opt/app/policy/bin/wait_for_port.sh
+      command: [
+        '-c', './kubernetes-participant.sh',
+        'message-router', '3905'
+        ]
+   policy-clamp-cl-pf-ppnt:
+      image: onap/policy-clamp-cl-pf-ppnt:latest
+      container_name: policy-clamp-cl-pf-ppnt
+      depends_on:
+       - simulator
+       - api
+      hostname: policy-clamp-cl-pf-ppnt
+      expose:
+       - 6973
+      volumes:
+       - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
       entrypoint: /opt/app/policy/bin/wait_for_port.sh
       command: [
         '-c', './policy-participant.sh',