diff --git a/INFO.yaml b/INFO.yaml
index 5c0e39c..e328101 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -61,6 +61,11 @@
       company: 'Bell Canada'
       id: 'a.sreekumar'
       timezone: 'Europe/Ireland'
+    - name: 'Ramesh Murugan Iyer'
+      email: 'ramesh.murugan.iyer@est.tech'
+      company: 'Ericsson'
+      id: 'rameshiyer27'
+      timezone: 'Europe/Ireland'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:
@@ -114,3 +119,6 @@
         - type: 'Removal'
           name: 'Xue Gao'
           link: https://lists.onap.org/g/onap-tsc/message/8096
+        - type: 'Addition'
+          name: 'Ramesh Murugan Iyer'
+          link: https://lists.onap.org/g/onap-tsc/message/8689
diff --git a/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml b/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
index f1ea39d..ca9d577 100644
--- a/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
+++ b/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
@@ -23,7 +23,7 @@
     properties:
       restRequestId:
         type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -52,7 +52,7 @@
     properties:
       configurationEntityId:
         type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition
                      Element
@@ -60,7 +60,7 @@
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 node_types:
   org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
@@ -82,6 +82,6 @@
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated
                      REST requests
diff --git a/common/src/main/resources/tosca/KubernetesAutomationCompositionElementType.yaml b/common/src/main/resources/tosca/KubernetesAutomationCompositionElementType.yaml
index 2b60b67..ad507ed 100644
--- a/common/src/main/resources/tosca/KubernetesAutomationCompositionElementType.yaml
+++ b/common/src/main/resources/tosca/KubernetesAutomationCompositionElementType.yaml
@@ -23,7 +23,7 @@
     properties:
       chartId:
         type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of the chart
       releaseName:
@@ -51,7 +51,7 @@
     properties:
       chart:
         type: org.onap.datatypes.policy.clamp.acm.kubernetesAutomationCompositionElement.Chart
-        typeVersion: 1.0.0
+        type_version: 1.0.0
         required: true
         description: The helm chart for the microservice
       configs:
diff --git a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml
index bd7242f..c9c11ed 100644
--- a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml
+++ b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml
@@ -34,7 +34,7 @@
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -62,14 +62,14 @@
     properties:
       configurationEntityId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
       restSequence:
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 
   node_types:
@@ -79,7 +79,7 @@
       properties:
         provider:
           type: string
-          requred: false
+          required: false
     org.onap.policy.clamp.acm.AutomationCompositionElement:
       version: 1.0.1
       derived_from: tosca.nodetypes.Root
@@ -92,7 +92,7 @@
           description: Specifies the organization that provides the automation composition element
         participant_id:
           type: onap.datatypes.ToscaConceptIdentifier
-          requred: true
+          required: true
           metadata:
             common: true
         participantType:
@@ -185,7 +185,7 @@
           required: true
           entry_schema:
             type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-            typeVersion: 1.0.0
+            type_version: 1.0.0
           description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 
 topology_template:
diff --git a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml
index 6adfceb..ed0b7c0 100644
--- a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml
+++ b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml
@@ -36,7 +36,7 @@
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -64,14 +64,14 @@
     properties:
       configurationEntityId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
       restSequence:
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 policy_types:
   # The following policy types will be created in policy framework by the acm policy participant
@@ -92,7 +92,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -105,7 +105,7 @@
         description: Specifies the organization that provides the automation composition element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
         metadata:
           common: true
       participantType:
@@ -185,10 +185,10 @@
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       policy_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -201,14 +201,14 @@
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
         entry_schema:
       values:
         type: string
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -228,7 +228,7 @@
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 
 topology_template:
@@ -251,7 +251,7 @@
       # The policy Acm element that deploys decision maker policy in policy framework.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for deploying sample decision maker policy
       properties:
         provider: Ericsson
@@ -277,7 +277,7 @@
       # The k8s Acm element that deploys the helm chart of nginx-ingress from nginx repo.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the K8S microservice to deploy nginx app
       properties:
         provider: ONAP
@@ -344,7 +344,7 @@
       # The ACM definition that comprises multiple Acm elements
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition with multiple Acm elements
       properties:
         provider: ONAP
diff --git a/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml b/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
index 8df3a4e..cf8aff4 100644
--- a/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
+++ b/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
@@ -139,7 +139,7 @@
       DN:
         name: DN
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name
         required: true
         constraints: [ ]
@@ -154,13 +154,13 @@
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.managedObjectDNsBasics
@@ -173,25 +173,25 @@
       measurementTypes:
         name: measurementTypes
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of measurement types
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of managed object distinguished names
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroup
@@ -204,13 +204,13 @@
       measurementGroup:
         name: measurementGroup
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Group
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroups
@@ -223,7 +223,7 @@
       measurementType:
         name: measurementType
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type
         required: true
         constraints: [ ]
@@ -238,13 +238,13 @@
       measurementType:
         name: measurementType
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementTypes
@@ -257,49 +257,49 @@
       modelNames:
         name: modelNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model names
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model invariant IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelVersionIDs:
         name: modelVersionIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model version IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       nfNames:
         name: nfNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of network functions
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.nfFilter
@@ -312,19 +312,19 @@
       measurementGroups:
         name: measurementGroups
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Groups
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       fileBasedGP:
         name: fileBasedGP
         type: integer
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: File based granularity period
         required: true
         constraints: [ ]
@@ -332,7 +332,7 @@
       fileLocation:
         name: fileLocation
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: ROP file location
         required: true
         constraints: [ ]
@@ -340,7 +340,7 @@
       subscriptionName:
         name: subscriptionName
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Name of the subscription
         required: true
         constraints: [ ]
@@ -348,7 +348,7 @@
       administrativeState:
         name: administrativeState
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: State of the subscription
         required: true
         constraints:
@@ -359,13 +359,13 @@
       nfFilter:
         name: nfFilter
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Network function filter
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.subscription
@@ -378,7 +378,7 @@
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -400,21 +400,21 @@
         required: true
         constraints: [ ]
         description: THe expected HTTP status code for the REST request
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      properties:
-        configurationEntityId:
-          type: onap.datatypes.ToscaConceptIdentifier
-          typeVersion: 1.0.0
-          required: true
-          description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-            typeVersion: 1.0.0
-          description: A sequence of REST commands to send to the REST endpoint
+  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
+    version: 1.0.0
+    derived_from: tosca.datatypes.Root
+    properties:
+      configurationEntityId:
+        type: onap.datatypes.ToscaConceptIdentifier
+        type_version: 0.0.0
+        required: true
+        description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
+      restSequence:
+        type: list
+        entry_schema:
+          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
+          type_version: 1.0.0
+        description: A sequence of REST commands to send to the REST endpoint
 policy_types:
   onap.policies.Monitoring:
     derived_from: tosca.policies.Root
@@ -431,7 +431,7 @@
       pmsh_policy:
         name: pmsh_policy
         type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: PMSH Policy JSON
         required: false
         constraints: [ ]
@@ -503,7 +503,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -516,7 +516,7 @@
         description: Specifies the organization that provides the automation composition element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
         metadata:
           common: true
       participantType:
@@ -596,17 +596,17 @@
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       policy_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -619,14 +619,14 @@
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
         entry_schema:
       values:
         type: string
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -646,7 +646,7 @@
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 
 topology_template:
@@ -674,7 +674,7 @@
     org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -692,7 +692,7 @@
     org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -718,7 +718,7 @@
       # Chart from new repository
       version: 1.2.3
       type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the K8S microservice for PMSH
       properties:
         provider: ONAP
@@ -834,7 +834,7 @@
     org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition for Hello World
       properties:
         provider: ONAP
@@ -3741,4 +3741,4 @@
                   restRequestTimeout: 2000
               eventProtocolParameters:
                 eventProtocol: JSON
-              eventNameFilter: CDSResponseStatusEvent
\ No newline at end of file
+              eventNameFilter: CDSResponseStatusEvent
diff --git a/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml b/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml
index a21a726..78dcc31 100644
--- a/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml
+++ b/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml
@@ -140,25 +140,25 @@
       measurementTypes:
         name: measurementTypes
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of measurement types
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of managed object distinguished names
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroup
@@ -171,13 +171,13 @@
       measurementGroup:
         name: measurementGroup
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Group
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroups
@@ -190,7 +190,7 @@
       measurementType:
         name: measurementType
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type
         required: true
         constraints: [ ]
@@ -205,13 +205,13 @@
       measurementType:
         name: measurementType
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementTypes
@@ -224,7 +224,7 @@
       DN:
         name: DN
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name
         required: true
         constraints: [ ]
@@ -239,13 +239,13 @@
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.managedObjectDNsBasics
@@ -258,49 +258,49 @@
       modelNames:
         name: modelNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model names
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model invariant IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelVersionIDs:
         name: modelVersionIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model version IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       nfNames:
         name: nfNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of network functions
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.nfFilter
@@ -313,19 +313,19 @@
       measurementGroups:
         name: measurementGroups
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Groups
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       fileBasedGP:
         name: fileBasedGP
         type: integer
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: File based granularity period
         required: true
         constraints: [ ]
@@ -333,7 +333,7 @@
       fileLocation:
         name: fileLocation
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: ROP file location
         required: true
         constraints: [ ]
@@ -341,7 +341,7 @@
       subscriptionName:
         name: subscriptionName
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Name of the subscription
         required: true
         constraints: [ ]
@@ -349,7 +349,7 @@
       administrativeState:
         name: administrativeState
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: State of the subscription
         required: true
         constraints:
@@ -360,13 +360,13 @@
       nfFilter:
         name: nfFilter
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Network function filter
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.subscription
@@ -379,7 +379,7 @@
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -407,14 +407,14 @@
     properties:
       configurationEntityId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation composition Element
       restSequence:
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 policy_types:
   onap.policies.Monitoring:
@@ -427,7 +427,7 @@
       tca.policy:
         name: tca.policy
         type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: TCA Gen2 Policy JSON
         required: false
         constraints: [ ]
@@ -497,7 +497,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -510,7 +510,7 @@
         description: Specifies the organization that provides the Automation composition element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
         metadata:
           common: true
       participantType:
@@ -606,7 +606,7 @@
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
@@ -634,7 +634,7 @@
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation composition Element is managing and their associated REST requests
 
 topology_template:
@@ -737,7 +737,7 @@
     org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition for TCA Gen2 microservice
       properties:
         provider: ONAP
diff --git a/examples/src/main/resources/clamp/acm/test/participant-http.yaml b/examples/src/main/resources/clamp/acm/test/participant-http.yaml
index 7bea30d..1e458c2 100644
--- a/examples/src/main/resources/clamp/acm/test/participant-http.yaml
+++ b/examples/src/main/resources/clamp/acm/test/participant-http.yaml
@@ -33,7 +33,7 @@
     properties:
       restRequestId:
         type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -56,21 +56,21 @@
         constraints:
           - in_range: [100, 599]
         description: THe expected HTTP status code for the REST request
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      properties:
-        configurationEntityId:
-          type:  onap.datatypes.ToscaConceptIdentifier
-          typeVersion: 1.0.0
-          required: true
-          description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-            typeVersion: 1.0.0
-          description: A sequence of REST commands to send to the REST endpoint
+  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
+    version: 1.0.0
+    derived_from: tosca.datatypes.Root
+    properties:
+      configurationEntityId:
+        type:  onap.datatypes.ToscaConceptIdentifier
+        type_version: 0.0.0
+        required: true
+        description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
+      restSequence:
+        type: list
+        entry_schema:
+          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
+          type_version: 1.0.0
+        description: A sequence of REST commands to send to the REST endpoint
 
 
 node_types:
@@ -80,17 +80,17 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -108,7 +108,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -133,7 +133,7 @@
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 topology_template:
   node_templates:
diff --git a/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml b/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml
index a2e9f61..cd1a3e8 100644
--- a/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml
+++ b/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml
@@ -33,17 +33,17 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -61,7 +61,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -79,14 +79,14 @@
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
         entry_schema:
       values:
         type: string
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.k8s.acm.K8SAutomationCompositionParticipant:
diff --git a/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml b/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml
index 2af2808..6d41d9f 100644
--- a/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml
+++ b/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml
@@ -17,17 +17,17 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -45,7 +45,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -57,21 +57,21 @@
     properties:
       dcae_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
diff --git a/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml b/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml
index a7a6bd2..69a8183 100644
--- a/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml
+++ b/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml
@@ -17,17 +17,17 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -45,7 +45,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -57,21 +57,21 @@
     properties:
       dcae_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
diff --git a/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
index c8796ac..c4f3735 100644
--- a/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
+++ b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
@@ -34,13 +34,13 @@
       consulUrl:
         name: consulUrl
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Consul url for this entry
         required: true
       consul_body:
         name: consulBody
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Body of Consul entry
         required: true
   onap.datatypes.monitoring.managedObjectDNsBasic:
@@ -49,7 +49,7 @@
       DN:
         name: DN
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name
         required: true
         constraints: []
@@ -64,13 +64,13 @@
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name object
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
     name: onap.datatypes.monitoring.managedObjectDNsBasics
@@ -83,25 +83,25 @@
       measurementTypes:
         name: measurementTypes
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of measurement types
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of managed object distinguished names
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
     name: onap.datatypes.monitoring.measurementGroup
@@ -114,13 +114,13 @@
       measurementGroup:
         name: measurementGroup
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Group
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
     name: onap.datatypes.monitoring.measurementGroups
@@ -133,7 +133,7 @@
       measurementType:
         name: measurementType
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type
         required: true
         constraints: []
@@ -148,13 +148,13 @@
       measurementType:
         name: measurementType
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type object
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
     name: onap.datatypes.monitoring.measurementTypes
@@ -167,49 +167,49 @@
       modelNames:
         name: modelNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model names
         required: true
         constraints: []
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model invariant IDs
         required: true
         constraints: []
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
       modelVersionIDs:
         name: modelVersionIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model version IDs
         required: true
         constraints: []
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
       nfNames:
         name: nfNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of network functions
         required: true
         constraints: []
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
     name: onap.datatypes.monitoring.nfFilter
@@ -222,19 +222,19 @@
       measurementGroups:
         name: measurementGroups
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Groups
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
       fileBasedGP:
         name: fileBasedGP
         type: integer
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: File based granularity period
         required: true
         constraints: []
@@ -242,7 +242,7 @@
       fileLocation:
         name: fileLocation
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: ROP file location
         required: true
         constraints: []
@@ -250,7 +250,7 @@
       subscriptionName:
         name: subscriptionName
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Name of the subscription
         required: true
         constraints: []
@@ -258,7 +258,7 @@
       administrativeState:
         name: administrativeState
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: State of the subscription
         required: true
         constraints:
@@ -269,13 +269,13 @@
       nfFilter:
         name: nfFilter
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Network function filter
         required: true
         constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: []
         metadata: {}
     name: onap.datatypes.monitoring.subscription
@@ -293,7 +293,7 @@
       pmsh_policy:
         name: pmsh_policy
         type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: PMSH Policy JSON
         required: false
         constraints: []
@@ -414,7 +414,7 @@
     org.onap.domain.pmsh.PMSH_DCAEMicroservice:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -638,7 +638,7 @@
     org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -653,7 +653,7 @@
     org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -668,7 +668,7 @@
     org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.CDSAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -681,7 +681,7 @@
     org.onap.domain.pmsh.PMSHAutomationCompositionDefinition:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition for Performance Management Subscription Handling
       properties:
         provider: Ericsson
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index bf5b2e3..10747ff 100644
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2021 Nordix Foundation.
+   Copyright (C) 2021-2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@
                             <name>onap/policy-clamp-runtime-acm</name>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>AcmRuntimeDockerfile</dockerFile>
+                                <dockerFile>AcmRuntime${dockerFileFlavor}.Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -115,7 +115,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp:policy-clamp-runtime-acm</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-runtime-acm.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
@@ -127,7 +127,7 @@
                             <alias>onap-policy-clamp-ac-pf-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>PolicyParticipantDockerfile</dockerFile>
+                                <dockerFile>PolicyParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -147,7 +147,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-policy</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-participant-impl-policy.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
@@ -159,7 +159,7 @@
                             <alias>onap-policy-clamp-ac-k8s-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>KubernetesParticipantDockerfile</dockerFile>
+                                <dockerFile>KubernetesParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -179,7 +179,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-kubernetes</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-participant-impl-kubernetes.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
@@ -191,7 +191,7 @@
                             <alias>onap-policy-clamp-ac-http-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>HttpParticipantDockerfile</dockerFile>
+                                <dockerFile>HttpParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -211,7 +211,7 @@
                                                 <includes>
                                                     <include>org.onap.policy.clamp.participant:policy-clamp-participant-impl-http</include>
                                                 </includes>
-                                                <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-participant-impl-http.jar</outputFileNameMapping>
                                             </dependencySet>
                                         </dependencySets>
                                     </inline>
diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile
similarity index 70%
copy from packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
copy to packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile
index b5b6de3..5ed5668 100644
--- a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime-Suse.Dockerfile
@@ -1,6 +1,6 @@
 #-------------------------------------------------------------------------------
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation.
+#  Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,20 +19,27 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs the CLAMP ACM runtime on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM runtime on Java 11 or better in OpenSuse
 #
-FROM onap/policy-jre-alpine:2.4.3
+FROM opensuse/leap:15.3
 
 LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/clamp
 
 ENV POLICY_LOGS=$POLICY_LOGS
-ENV POLICY_HOME=$POLICY_HOME/clamp
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
 
-RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
-    chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \
+    zypper -n -q update && zypper -n -q clean --all && \
+    groupadd --system policy && \
+    useradd --system --shell /bin/sh -G policy policy && \
+    mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+    chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
     mkdir /packages
+
 COPY /maven/lib/policy-clamp-runtime-acm.tar.gz /packages
 
 RUN tar xvfz /packages/policy-clamp-runtime-acm.tar.gz --directory $POLICY_HOME && \
@@ -40,7 +47,7 @@
 
 WORKDIR $POLICY_HOME
 COPY acm-runtime.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-runtime-acm.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile
similarity index 96%
rename from packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
rename to packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile
index b5b6de3..b4dad4e 100644
--- a/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile
@@ -40,7 +40,7 @@
 
 WORKDIR $POLICY_HOME
 COPY acm-runtime.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-runtime-acm.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile
similarity index 69%
copy from packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
copy to packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile
index 4311f6c..3d63317 100644
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant-Suse.Dockerfile
@@ -1,6 +1,6 @@
 #-------------------------------------------------------------------------------
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation.
+#  Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,21 +19,27 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs the CLAMP ACM HTTP Participant on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM HTTP Participant on Java 11 or better in OpenSuse
 #
-
-FROM onap/policy-jre-alpine:2.4.3
+FROM opensuse/leap:15.3
 
 LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/clamp
 
 ENV POLICY_LOGS=$POLICY_LOGS
-ENV POLICY_HOME=$POLICY_HOME/clamp
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
 
-RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
-    chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \
+    zypper -n -q update && zypper -n -q clean --all && \
+    groupadd --system policy && \
+    useradd --system --shell /bin/sh -G policy policy && \
+    mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+    chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
     mkdir /packages
+
 COPY /maven/lib/http-participant.tar.gz /packages
 
 RUN tar xvfz /packages/http-participant.tar.gz --directory $POLICY_HOME && \
@@ -41,7 +47,7 @@
 
 WORKDIR $POLICY_HOME
 COPY http-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-http.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
similarity index 96%
rename from packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
rename to packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
index 4311f6c..970f8aa 100644
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
@@ -41,7 +41,7 @@
 
 WORKDIR $POLICY_HOME
 COPY http-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-http.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile
similarity index 74%
copy from packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
copy to packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile
index bed957c..9e6d0ef 100644
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant-Suse.Dockerfile
@@ -1,6 +1,6 @@
 #-------------------------------------------------------------------------------
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation.
+#  Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,20 +19,27 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs the CLAMP ACM K8S Participant on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM K8S Participant on Java 11 or better in OpenSuse
 #
-FROM onap/policy-jre-alpine:2.4.3
+FROM opensuse/leap:15.3
 
 LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/clamp
 
 ENV POLICY_LOGS=$POLICY_LOGS
-ENV POLICY_HOME=$POLICY_HOME/clamp
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
 
-RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
-    chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar wget && \
+    zypper -n -q update && zypper -n -q clean --all && \
+    groupadd --system policy && \
+    useradd --system --shell /bin/sh -G policy policy && \
+    mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+    chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
     mkdir /packages
+
 COPY /maven/lib/kubernetes-participant.tar.gz /packages
 
 RUN tar xvfz /packages/kubernetes-participant.tar.gz --directory $POLICY_HOME && \
@@ -40,13 +47,11 @@
 
 WORKDIR $POLICY_HOME
 COPY kubernetes-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-kubernetes.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
     chown -R policy:policy /app && \
-    apk update && \
-    apk add wget && \
     wget https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz && \
     tar xvf helm-v3.5.2-linux-amd64.tar.gz && \
     mv linux-amd64/helm /usr/local/bin && \
diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
similarity index 96%
rename from packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
rename to packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
index bed957c..4d3303e 100644
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
@@ -40,7 +40,7 @@
 
 WORKDIR $POLICY_HOME
 COPY kubernetes-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-kubernetes.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile
similarity index 69%
copy from packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
copy to packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile
index f70e07e..e688d97 100644
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant-Suse.Dockerfile
@@ -1,6 +1,6 @@
 #-------------------------------------------------------------------------------
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation.
+#  Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,20 +19,27 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs the CLAMP ACM Policy Framework Participant on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM Policy Framework Participant on Java 11 or better in OpenSuse
 #
-FROM onap/policy-jre-alpine:2.4.3
+FROM opensuse/leap:15.3
 
 LABEL maintainer="Policy Team"
 
 ARG POLICY_LOGS=/var/log/onap/policy/clamp
 
 ENV POLICY_LOGS=$POLICY_LOGS
-ENV POLICY_HOME=$POLICY_HOME/clamp
+ENV POLICY_HOME=/opt/app/policy/clamp
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
 
-RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
-    chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \
+RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \
+    zypper -n -q update && zypper -n -q clean --all && \
+    groupadd --system policy && \
+    useradd --system --shell /bin/sh -G policy policy && \
+    mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
+    chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \
     mkdir /packages
+
 COPY /maven/lib/policy-participant.tar.gz /packages
 
 RUN tar xvfz /packages/policy-participant.tar.gz --directory $POLICY_HOME && \
@@ -40,7 +47,7 @@
 
 WORKDIR $POLICY_HOME
 COPY policy-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-policy.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
similarity index 96%
rename from packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
rename to packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
index f70e07e..ceb4776 100644
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
@@ -40,7 +40,7 @@
 
 WORKDIR $POLICY_HOME
 COPY policy-participant.sh  bin/.
-COPY /maven/app.jar /app
+COPY /maven/policy-clamp-participant-impl-policy.jar /app/app.jar
 
 RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
diff --git a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
index 84550de..10a8a3c 100644
--- a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
+++ b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
@@ -19,7 +19,6 @@
 # ============LICENSE_END=========================================================
 #
 
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
 KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
 TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
 KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,13 @@
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/AcRuntimeParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp runtime acm config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,11 +49,7 @@
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-touch /app/app.jar
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/AcRuntimeParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
@@ -68,4 +61,4 @@
     -Dcom.sun.management.jmxremote.authenticate=false \
     -Dcom.sun.management.jmxremote.local.only=false \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/AcRuntimeParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"
diff --git a/packages/policy-clamp-docker/src/main/docker/http-participant.sh b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
index 17daa18..4610608 100644
--- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
@@ -19,7 +19,6 @@
 # ============LICENSE_END=========================================================
 #
 
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
 KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
 TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
 KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,13 @@
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/HttpParticipantParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp HTTP participant config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,13 +49,10 @@
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/HttpParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
     -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/HttpParticipantParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"
diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
index 3c5fe5c..50b6ddb 100644
--- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
@@ -19,7 +19,6 @@
 # ============LICENSE_END=========================================================
 #
 
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
 KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
 TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
 KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,13 @@
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/KubernetesParticipantParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp Kubernetes participant config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,13 +49,10 @@
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/KubernetesParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
     -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/KubernetesParticipantParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"
diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
index 77cd0c0..6495fa9 100644
--- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
@@ -19,7 +19,6 @@
 # ============LICENSE_END=========================================================
 #
 
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
 KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
 TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
 KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
@@ -27,15 +26,13 @@
 
 if [ "$#" -eq 1 ]; then
     CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml"
 fi
 
-echo "Policy clamp config file: $CONFIG_FILE"
+echo "Policy clamp policy participant config file: $CONFIG_FILE"
 
 if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
@@ -52,14 +49,10 @@
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-touch /app/app.jar
-mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/PolicyParticipantParameters.yaml
-
-$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
+$JAVA_HOME/bin/java \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
     -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
     -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
     -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/PolicyParticipantParameters.yaml"
+    --spring.config.location="${CONFIG_FILE}"
diff --git a/packages/pom.xml b/packages/pom.xml
index db32c8b..edac17e 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2021 Nordix Foundation.
+   Copyright (C) 2021-2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -54,6 +54,18 @@
             </modules>
             <properties>
                 <docker.skip.push>false</docker.skip.push>
+                <dockerFileFlavor/>
+            </properties>
+        </profile>
+        <profile>
+            <id>dockersuse</id>
+            <modules>
+                <module>policy-clamp-tarball</module>
+                <module>policy-clamp-docker</module>
+            </modules>
+            <properties>
+                <docker.skip.push>false</docker.skip.push>
+                <dockerFileFlavor>-Suse</dockerFileFlavor>
             </properties>
         </profile>
     </profiles>
diff --git a/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml
index 3e5782c..ef0e67c 100644
--- a/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml
+++ b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml
@@ -16,17 +16,17 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -44,7 +44,7 @@
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -56,21 +56,21 @@
     properties:
       dcae_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 77559a2..7e3d7b2 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -141,6 +141,18 @@
                 <docker.skip.tag>false</docker.skip.tag>
                 <docker.skip.push>false</docker.skip.push>
                 <docker.skip>false</docker.skip>
+                <dockerFile>backend/Dockerfile</dockerFile>
+            </properties>
+        </profile>
+        <profile>
+            <id>dockersuse</id>
+            <properties>
+                <skip.staging.artifacts>true</skip.staging.artifacts>
+                <docker.skip.build>false</docker.skip.build>
+                <docker.skip.tag>false</docker.skip.tag>
+                <docker.skip.push>false</docker.skip.push>
+                <docker.skip>false</docker.skip>
+                <dockerFile>backend/suse.Dockerfile</dockerFile>
             </properties>
         </profile>
     </profiles>
@@ -734,7 +746,7 @@
                                 </tags>
                                 <!-- A relative path is looked up in ${project.basedir}/src/main/docker by
                                     default -->
-                                <dockerFile>backend/Dockerfile</dockerFile>
+                                <dockerFile>${dockerFile}</dockerFile>
                                 <assembly>
                                     <descriptor>backend/backend-files.xml</descriptor>
                                     <name>onap-policy-clamp-backend</name>
diff --git a/runtime/src/main/docker/backend/suse.Dockerfile b/runtime/src/main/docker/backend/suse.Dockerfile
new file mode 100644
index 0000000..9ab5424
--- /dev/null
+++ b/runtime/src/main/docker/backend/suse.Dockerfile
@@ -0,0 +1,52 @@
+#
+# ============LICENSE_START=======================================================
+# ONAP
+# ================================================================================
+# Copyright (C) 2022 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+
+FROM opensuse/leap:15.3
+
+MAINTAINER "The Onap Team"
+LABEL Description="This image contains opensuse, openjdk 11 and policy clamp"
+
+ARG http_proxy
+ARG https_proxy
+ENV HTTP_PROXY=$http_proxy
+ENV HTTPS_PROXY=$https_proxy
+ENV http_proxy=$HTTP_PROXY
+ENV https_proxy=$HTTPS_PROXY
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11
+
+USER root
+
+RUN zypper -n -q install --no-recommends java-11-openjdk-headless netcat-openbsd && \
+    zypper -n -q update; zypper -n -q clean --all && \
+    groupadd --system onap && \
+    useradd --system --shell /bin/sh -G onap onap && \
+    mkdir -p /opt/policy/clamp /var/log/onap/clamp && \
+    chown -R onap:onap /opt/policy/clamp /var/log/onap/clamp
+
+VOLUME /opt/policy/clamp/config
+
+COPY --chown=onap:onap onap-policy-clamp-backend/policy-clamp-backend.jar /opt/policy/clamp/policy-clamp-backend.jar
+
+USER onap
+WORKDIR /opt/policy/clamp/
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0","-XX:MaxRAMPercentage=75.0","-jar","./policy-clamp-backend.jar"]