diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 0878872..1f236de 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -6,37 +6,37 @@
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
       - gerrit-maven-merge:
-          mvn-goals: 'clean install'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-goals: "clean install"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean deploy docker:build -DpushImage'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: "clean deploy docker:build -DpushImage"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-    project: 'dcaegen2/analytics/tca-gen2'
+    project: "dcaegen2/analytics/tca-gen2"
     # job template iterators
-    project-name: 'dcaegen2-analytics-tca-gen2'
+    project-name: "dcaegen2-analytics-tca-gen2"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    mvn-version: 'mvn35'
-    maven-version: 'mvn35'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
+    mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+    mvn-version: "mvn35"
+    maven-version: "mvn35"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
     maven-deploy-properties: |
       deployAtEnd=true
-    archive-artifacts: ''
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -45,35 +45,35 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/analytics/tca-gen2'
-    project-name: 'dcaegen2-analytics-tca-gen2'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
-    maven-version: 'mvn35'
+    project: "dcaegen2/analytics/tca-gen2"
+    project-name: "dcaegen2-analytics-tca-gen2"
+    branch: "master"
+    mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-version: "mvn35"
+    maven-version: "mvn35"
 
 - project:
     name: dcaegen2-analytics-tca-gen2-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/analytics/tca-gen2
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-analytics-tca-gen2'
+    project-name: "dcaegen2-analytics-tca-gen2"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    mvn-version: 'mvn35'
-    maven-version: 'mvn35'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+    mvn-version: "mvn35"
+    maven-version: "mvn35"
 
 - project:
     name: dcaegen2-analytics-tca-gen2-info
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
index 54f54db..4815e98 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
@@ -1,17 +1,18 @@
+---
 - project:
     name: dcaegen2-collectors-datafile-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-collectors-datafile'
-    recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2-collectors-datafile"
+    recipients: "vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'ManagementInterface-suite':
+      - "ManagementInterface-suite":
           trigger_jobs:
-      - 'Functional-suite':
+      - "Functional-suite":
           trigger_jobs:
-    robot-options: ''
-    branch: 'master'
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index decb7ca..4972479 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -2,73 +2,73 @@
 - project:
     name: dcaegen2-collectors-datafile
     # job template iterators
-    project-name: 'dcaegen2-collectors-datafile'
+    project-name: "dcaegen2-collectors-datafile"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
     # apply to all jobs
-    project: 'dcaegen2/collectors/datafile'
-    mvn-settings: 'dcaegen2-collectors-datafile-settings'
-    files: '**'
+    project: "dcaegen2/collectors/datafile"
+    mvn-settings: "dcaegen2-collectors-datafile-settings"
+    files: "**"
     maven-deploy-properties: |
       deployAtEnd=true
-    archive-artifacts: ''
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-          mvn-goals: 'clean install'
+          mvn-goals: "clean install"
       - gerrit-maven-merge:
-          mvn-goals: 'clean deploy'
+          mvn-goals: "clean deploy"
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
 
 - project:
     name: dcaegen2-collectors-datafile-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/collectors/datafile'
-    project-name: 'dcaegen2-collectors-datafile'
-    branch: 'master'
+    project: "dcaegen2/collectors/datafile"
+    project-name: "dcaegen2-collectors-datafile"
+    branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-collectors-datafile-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-settings: "dcaegen2-collectors-datafile-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-datafile-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/datafile
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-datafile'
+    project-name: "dcaegen2-collectors-datafile"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-collectors-datafile-settings'
+    mvn-settings: "dcaegen2-collectors-datafile-settings"
 
 - project:
     name: dcaegen2-collectors-datafile-info
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 0a2921f..c7eb274 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -1,15 +1,16 @@
+---
 - project:
     name: dcaegen2-collectors-hv-ves-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-collectors-hv-ves'
-    recipients: 'vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2-collectors-hv-ves"
+    recipients: "vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites':
+      - "testsuites":
           trigger_jobs:
-            - '{project-name}-{stream}-merge-java'
-    robot-options: ''
+            - "{project-name}-{stream}-merge-java"
+    robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 9113d75..6cc45f0 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -2,42 +2,42 @@
 - project:
     name: dcaegen2-collectors-hv-ves
     # job template iterators
-    project-name: 'dcaegen2-collectors-hv-ves'
+    project-name: "dcaegen2-collectors-hv-ves"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     # apply to all jobs
     java-version: openjdk11
-    project: 'dcaegen2/collectors/hv-ves'
-    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
-    files: '**'
+    project: "dcaegen2/collectors/hv-ves"
+    mvn-settings: "dcaegen2-collectors-hv-ves-settings"
+    files: "**"
     maven-deploy-properties: |
       deployAtEnd=true
-    archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    archive-artifacts: "hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-          mvn-goals: 'clean install'
+          mvn-goals: "clean install"
       - gerrit-maven-merge:
-          mvn-goals: 'clean deploy'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-goals: "clean deploy"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-          mvn-goals: 'clean deploy -Ddocker.skip'
+          mvn-goals: "clean deploy -Ddocker.skip"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
 
 - project:
     name: dcaegen2-collectors-hv-ves-sonar
@@ -45,32 +45,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/collectors/hv-ves'
-    project-name: 'dcaegen2-collectors-hv-ves'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/collectors/hv-ves"
+    project-name: "dcaegen2-collectors-hv-ves"
+    branch: "master"
+    mvn-settings: "dcaegen2-collectors-hv-ves-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-hv-ves-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/hv-ves
-    project-name: 'dcaegen2-collectors-hv-ves'
+    project-name: "dcaegen2-collectors-hv-ves"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     build-node: ubuntu1804-docker-8c-8g
-    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
-
+    mvn-settings: "dcaegen2-collectors-hv-ves-settings"
 
 - project:
     name: dcaegen2-collectors-hv-ves-info
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
index 31db44a..1e93535 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
@@ -1,15 +1,16 @@
+---
 - project:
     name: dcaegen2-collectors-restconf-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-collectors-restconf'
-    recipients: 'vv770d@att.com swarup.nayak1@huawei.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2-collectors-restconf"
+    recipients: "vv770d@att.com swarup.nayak1@huawei.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites':
+      - "testsuites":
           trigger_jobs:
-            - '{project-name}-{stream}-merge-java'
-    robot-options: ''
+            - "{project-name}-{stream}-merge-java"
+    robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 13e8ada..6bd87de 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-collectors-restconf
-    project-name: 'dcaegen2-collectors-restconf'
+    project-name: "dcaegen2-collectors-restconf"
     java-version: openjdk11
     jobs:
       - gerrit-maven-verify:
@@ -14,28 +14,28 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dcaegen2/collectors/restconf'
+    project: "dcaegen2/collectors/restconf"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    mvn-settings: 'dcaegen2-collectors-restconf-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    mvn-settings: "dcaegen2-collectors-restconf-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-collectors-restconf-sonar
@@ -43,31 +43,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/collectors/restconf'
-    project-name: 'dcaegen2-collectors-restconf'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-restconf-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/collectors/restconf"
+    project-name: "dcaegen2-collectors-restconf"
+    branch: "master"
+    mvn-settings: "dcaegen2-collectors-restconf-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-restconf-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/restconf
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-restconf'
+    project-name: "dcaegen2-collectors-restconf"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-restconf-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-collectors-restconf-settings"
 
 - project:
     name: dcaegen2-collectors-restconf-info
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index c3b7a85..c6dba05 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -1,52 +1,51 @@
 ---
 - project:
     name: dcaegen2-collectors-snmptrap
-    project-name: 'dcaegen2-collectors-snmptrap'
-    project: 'dcaegen2/collectors/snmptrap'
+    project-name: "dcaegen2-collectors-snmptrap"
+    project: "dcaegen2/collectors/snmptrap"
     python-version: python3
-    tox-dir: '.'
+    tox-dir: "."
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     build-node: ubuntu1804-docker-8c-8g
-    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+    mvn-settings: "dcaegen2-collectors-snmptrap-settings"
     jobs:
-      - '{project-name}-python-jobs':
-               pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-python-jobs":
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - "{project-name}-{stream}-release-version-java-daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    archive-artifacts: ''
+    archive-artifacts: ""
     container-tag-method: latest
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '.*'
+        pattern: ".*"
     maven-deploy-properties: |
       deployAtEnd=true
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dcaegen2/collectors/snmptrap'
-    project-name: 'dcaegen2-collectors-snmptrap'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/collectors/snmptrap"
+    project-name: "dcaegen2-collectors-snmptrap"
+    branch: "master"
+    mvn-settings: "dcaegen2-collectors-snmptrap-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-snmptrap-info
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 9b854eb..1a34e67 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-collectors-ves
-    project-name: 'dcaegen2-collectors-ves'
+    project-name: "dcaegen2-collectors-ves"
     java-version: openjdk11
     jobs:
       - gerrit-maven-verify:
@@ -16,30 +16,30 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'dcaegen2/collectors/ves'
+    project: "dcaegen2/collectors/ves"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dcaegen2-collectors-ves-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dcaegen2-collectors-ves-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    mvn-version: 'mvn36'
-    nexus-snapshot-repo: 'snapshots'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
+    mvn-snapshot-id: "ecomp-snapshots"
+    mvn-version: "mvn36"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: dcaegen2-collectors-ves-sonar
@@ -47,31 +47,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/collectors/ves'
-    project-name: 'dcaegen2-collectors-ves'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-ves-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/collectors/ves"
+    project-name: "dcaegen2-collectors-ves"
+    branch: "master"
+    mvn-settings: "dcaegen2-collectors-ves-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-ves-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/ves
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-ves'
+    project-name: "dcaegen2-collectors-ves"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-ves-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-collectors-ves-settings"
 
 - project:
     name: dcaegen2-collectors-ves-info
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 484a1fb..f7836e1 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -1,44 +1,44 @@
 ---
 - project:
     name: dcaegen2-deployments
-    project-name: 'dcaegen2-deployments'
+    project-name: "dcaegen2-deployments"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - "{project-name}-{stream}-release-version-java-daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dcaegen2/deployments'
+    project: "dcaegen2/deployments"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dcaegen2-deployments-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dcaegen2-deployments-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-v1-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-v1-8c-8g"
     build-timeout: 180
 
 - project:
     name: dcaegen2-deployments-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     build-node: ubuntu1804-docker-8c-8g
     project: dcaegen2/deployments
-    project-name: 'dcaegen2-deployments'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-deployments-settings'
+    project-name: "dcaegen2-deployments"
+    branch: "master"
+    mvn-settings: "dcaegen2-deployments-settings"
 
 - project:
     name: dcaegen2-deployments-info
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 655c0b8..56da81a 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -1,75 +1,74 @@
 ---
 - project:
-      name: dcaegen2-platform-ves-openapi-manager
-      project-name: 'dcaegen2-platform-ves-openapi-manager'
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-verify:
-                pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-          - gerrit-maven-merge
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                sbom-generator: true
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean package docker:build docker:push'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-2c-1g
+    name: dcaegen2-platform-ves-openapi-manager
+    project-name: "dcaegen2-platform-ves-openapi-manager"
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build docker:push"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'dcaegen2/platform/ves-openapi-manager'
-      stream:
-          - 'master':
-              branch: 'master'
-          - 'kohn':
-              branch: 'kohn'
-      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
-      mvn-snapshot-id: 'ecomp-snapshots'
-      nexus-snapshot-repo: 'snapshots'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "dcaegen2/platform/ves-openapi-manager"
+    stream:
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: dcaegen2-platform-ves-openapi-sonar
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-sonar
-      sonarcloud: true
-      sonarcloud-project-organization: '{sonarcloud_project_organization}'
-      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-      sonar-mvn-goal: '{sonar_mvn_goal}'
-      cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
-      project: 'dcaegen2/platform/ves-openapi-manager'
-      project-name: 'dcaegen2-platform-ves-openapi-manager'
-      branch: 'master'
-      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: dcaegen2-platform-ves-openapi-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: ubuntu1804-docker-8c-8g
+    project: "dcaegen2/platform/ves-openapi-manager"
+    project-name: "dcaegen2-platform-ves-openapi-manager"
+    branch: "master"
+    mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-platform-ves-openapi-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/platform/ves-openapi-manager
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-ves-openapi-manager'
+    project-name: "dcaegen2-platform-ves-openapi-manager"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
-
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
 
 - project:
     name: dcaegen2-platform-ves-openapi-manager-project-view
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index f194070..fc0a4b9 100644
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -13,7 +13,7 @@
     project-name: dcaegen2-platform
     mvn-settings: dcaegen2-platform-settings
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
     build-node: centos7-docker-2c-1g
     project: dcaegen2/platform
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index c6158bd..9279e2e 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,138 +1,138 @@
 ---
 - project:
     name: dcaegen2-services-datalake-handler
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
       - gerrit-maven-merge
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    maven-version: 'mvn35'
-    mvn-settings: 'dcaegen2-services-settings'
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    mvn-params: '-f components/datalake-handler/pom.xml'
+    maven-version: "mvn35"
+    mvn-settings: "dcaegen2-services-settings"
+    container-public-registry: "nexus3.onap.org:10001"
+    container-staging-registry: "nexus3.onap.org:10003"
+    mvn-params: "-f components/datalake-handler/pom.xml"
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/datalake-handler/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+        pattern: "components/datalake-handler/**"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-services-datalake-handler-release
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler"
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          sbom-path: 'components/datalake-handler/'
+          sbom-path: "components/datalake-handler/"
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-pom: 'components/datalake-handler/pom.xml'
-          mvn-params: '-f components/datalake-handler/pom.xml'
-          version-properties-file: 'components/datalake-handler/version.properties'
+          mvn-pom: "components/datalake-handler/pom.xml"
+          mvn-params: "-f components/datalake-handler/pom.xml"
+          version-properties-file: "components/datalake-handler/version.properties"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
     stream:
-      - 'master':
-         branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/datalake-handler/feeder/**'
-    mvn-settings: 'dcaegen2-services-settings'
+        pattern: "components/datalake-handler/feeder/**"
+    mvn-settings: "dcaegen2-services-settings"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-services-datalake-handler-admin-ui-release
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler-admin-ui'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler-admin-ui"
     jobs:
       - gerrit-maven-stage:
           sbom-generator: true
-          sbom-path: 'components/datalake-handler/'
+          sbom-path: "components/datalake-handler/"
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-pom: 'components/datalake-handler/pom.xml'
-          mvn-params: '-f components/datalake-handler/pom.xml'
-          version-properties-file: 'components/datalake-handler/version.properties'
+          mvn-pom: "components/datalake-handler/pom.xml"
+          mvn-params: "-f components/datalake-handler/pom.xml"
+          version-properties-file: "components/datalake-handler/version.properties"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/datalake-handler/admin/**'
-    mvn-settings: 'dcaegen2-services-settings'
+        pattern: "components/datalake-handler/admin/**"
+    mvn-settings: "dcaegen2-services-settings"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-services-datalake-handler-des-release
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler-des'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler-des"
     jobs:
       - gerrit-maven-stage:
           sbom-generator: true
-          sbom-path: 'components/datalake-handler/'
+          sbom-path: "components/datalake-handler/"
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-pom: 'components/datalake-handler/pom.xml'
-          mvn-params: '-f components/datalake-handler/pom.xml'
-          version-properties-file: 'components/datalake-handler/version.properties'
+          mvn-pom: "components/datalake-handler/pom.xml"
+          mvn-params: "-f components/datalake-handler/pom.xml"
+          version-properties-file: "components/datalake-handler/version.properties"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
     stream:
-      - 'master':
-         branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
+    mvn-settings: "dcaegen2-services-settings"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
+    files: "**"
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/datalake-handler/des/**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+        pattern: "components/datalake-handler/des/**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-services-datalake-handler-sonar
@@ -140,15 +140,15 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-datalake-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
-    mvn-params: '-f components/datalake-handler/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-datalake-handler"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
+    mvn-params: "-f components/datalake-handler/pom.xml"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 6b87670..20967d1 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -35,43 +35,43 @@
     #    jobs:
     #      - dcaegen2-docker-python-jobs
 
-    name: '{project-name}-docker-python-jobs'
+    name: "{project-name}-docker-python-jobs"
     container-tag-method: latest
-    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
-    nexus-iq-namespace: 'onap-'
-    tox-dir: '{src-dir}'
-    tox-envs: 'py3'
+    docker-get-container-tag-script: "../../shell/docker-ts-tag-override.sh"
+    nexus-iq-namespace: "onap-"
+    tox-dir: "{src-dir}"
+    tox-envs: "py3"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     python-version: python3
-    wss-product-name: '{project-name}'
-    docker-root: '{src-dir}'
+    wss-product-name: "{project-name}"
+    docker-root: "{src-dir}"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{src-dir}/.*'
+        pattern: "{src-dir}/.*"
     jobs:
       - gerrit-tox-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
           stream: all
-          branch: '*'
+          branch: "*"
       - gerrit-docker-verify
       - gerrit-docker-merge:
           post_docker_build_script: |
-              #!/bin/bash
-              set -uex -o pipefail
-              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
-              DNAME={container-snapshot-registry}/{docker-name}
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
-              docker push $DNAME:$DOCKER_IMAGE_TAG2
-              docker push $DNAME:latest
+            #!/bin/bash
+            set -uex -o pipefail
+            DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+            DNAME={container-snapshot-registry}/{docker-name}
+            docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+            docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+            docker push $DNAME:$DOCKER_IMAGE_TAG2
+            docker push $DNAME:latest
           stream: master
           branch: master
       - gerrit-tox-sonar:
           # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
-          sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
-          cron: '@daily'
+          sonar-mvn-goal: "-f {src-dir}/pom.xml sonar:sonar"
+          cron: "@daily"
           stream: master
           branch: master
 
@@ -90,7 +90,7 @@
       - kohn:
           branch: kohn
     jobs:
-      - '{project-name}-docker-python-jobs'
+      - "{project-name}-docker-python-jobs"
 
 - project:
     name: dcaegen2-services-ml
@@ -107,7 +107,7 @@
       - kohn:
           branch: kohn
     jobs:
-      - '{project-name}-docker-python-jobs'
+      - "{project-name}-docker-python-jobs"
 
 - project:
     name: dcaegen2-services-subprojects-view
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 0108dc0..f7f66bb 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -1,28 +1,28 @@
 ---
 - project:
     name: dcaegen2-services-heartbeat
-    project-name: 'dcaegen2-services-heartbeat'
+    project-name: "dcaegen2-services-heartbeat"
     jobs:
-      - '{project-name}-python-jobs':
-               pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-python-jobs":
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - "{project-name}-{stream}-release-version-java-daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dcaegen2/services/heartbeat'
+    project: "dcaegen2/services/heartbeat"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dcaegen2-services-heartbeat-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
     build-timeout: 60
 
 - project:
@@ -30,28 +30,28 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services/heartbeat'
-    project-name: 'dcaegen2-services-heartbeat'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-heartbeat-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services/heartbeat"
+    project-name: "dcaegen2-services-heartbeat"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-heartbeat-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/heartbeat
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-services-heartbeat'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-heartbeat-settings'
+    project-name: "dcaegen2-services-heartbeat"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"
 
 - project:
     name: dcaegen2-services-heartbeat-info
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index f41f1b7..7cbb68b 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -1,64 +1,64 @@
 ---
 - project:
     name: dcaegen2-services-kpi-computation-ms
-    project-name: 'dcaegen2-services-kpi-computation-ms'
-    project: 'dcaegen2/services'
+    project-name: "dcaegen2-services-kpi-computation-ms"
+    project: "dcaegen2/services"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
       - gerrit-maven-merge
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    mvn-goals: 'clean package docker:build'
-    mvn-params: '-f components/kpi-computation-ms/pom.xml'
+    mvn-settings: "dcaegen2-services-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
+    container-public-registry: "nexus3.onap.org:10001"
+    container-staging-registry: "nexus3.onap.org:10003"
+    mvn-goals: "clean package docker:build"
+    mvn-params: "-f components/kpi-computation-ms/pom.xml"
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/kpi-computation-ms/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+        pattern: "components/kpi-computation-ms/**"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     maven-deploy-properties: |
       deployAtEnd=true
 
 - project:
     name: dcaegen2-services-kpi-computation-ms-release
-    project-name: 'dcaegen2-services-kpi-computation-ms'
-    project: 'dcaegen2/services'
+    project-name: "dcaegen2-services-kpi-computation-ms"
+    project: "dcaegen2/services"
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          sbom-path: 'components/kpi-computation-ms/'
+          sbom-path: "components/kpi-computation-ms/"
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-          mvn-pom: 'components/kpi-computation-ms/pom.xml'
-          mvn-params: '-f components/kpi-computation-ms/pom.xml'
+          mvn-pom: "components/kpi-computation-ms/pom.xml"
+          mvn-params: "-f components/kpi-computation-ms/pom.xml"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-          mvn-params: '-f components/kpi-computation-ms/pom.xml'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+          mvn-params: "-f components/kpi-computation-ms/pom.xml"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
-    files: '**'
-    archive-artifacts: ''
+    mvn-settings: "dcaegen2-services-settings"
+    files: "**"
+    archive-artifacts: ""
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/kpi-computation-ms/**'
-    build-node: 'ubuntu1804-docker-8c-8g'
+        pattern: "components/kpi-computation-ms/**"
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -68,30 +68,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-kpi-computation-ms'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
-    mvn-goals: 'clean install'
-    mvn-params: '-f components/kpi-computation-ms/pom.xml'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-kpi-computation-ms"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
+    mvn-goals: "clean install"
+    mvn-params: "-f components/kpi-computation-ms/pom.xml"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-kpi-computation-ms-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-services-kpi-computation-ms-clm'
-    mvn-params: '-f components/kpi-computation-ms/pom.xml'
+    project-name: "dcaegen2-services-kpi-computation-ms-clm"
+    mvn-params: "-f components/kpi-computation-ms/pom.xml"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 20d1b60..2fd7f91 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-services-mapper
-    project-name: 'dcaegen2-services-mapper'
+    project-name: "dcaegen2-services-mapper"
     java-version: openjdk11
     jobs:
       - gerrit-maven-verify:
@@ -14,24 +14,24 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-goals: "clean package docker:build -DpushImageTag"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'dcaegen2/services/mapper'
+    project: "dcaegen2/services/mapper"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dcaegen2-services-mapper-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dcaegen2-services-mapper-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -41,31 +41,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dcaegen2/services/mapper'
-    project-name: 'dcaegen2-services-mapper'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-mapper-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services/mapper"
+    project-name: "dcaegen2-services-mapper"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-mapper-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-mapper-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/mapper
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-services-mapper'
+    project-name: "dcaegen2-services-mapper"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-mapper-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-mapper-settings"
 
 - project:
     name: dcaegen2-services-mapper-info
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
index f7bbf5a..a6d7d13 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
@@ -1,18 +1,18 @@
 ---
 - project:
-      name: dcaegen2-services-pm-mapper-csit
-      jobs:
-          - '{project-name}-review-verification-maven-{stream}':
-                  mvn-goals: clean install docker:build
-          - '{project-name}-merge-verification-maven-{stream}':
-                  mvn-goals: clean install docker:build
-      project-name: 'dcaegen2-services-pm-mapper'
-      recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
-      # project name in gerrit
-      project: 'dcaegen2/services/pm-mapper'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-      robot-options: ''
-      branch: 'master'
+    name: dcaegen2-services-pm-mapper-csit
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install docker:build
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean install docker:build
+    project-name: "dcaegen2-services-pm-mapper"
+    recipients: "vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com"
+    # project name in gerrit
+    project: "dcaegen2/services/pm-mapper"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-pm-mapper-settings"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 04c7a5f..13a3bb8 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -2,73 +2,73 @@
 - project:
     name: dcaegen2-services-pm-mapper
     # job template iterators
-    project-name: 'dcaegen2-services-pm-mapper'
+    project-name: "dcaegen2-services-pm-mapper"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
     # apply to all jobs
-    project: 'dcaegen2/services/pm-mapper'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    project: "dcaegen2/services/pm-mapper"
+    mvn-settings: "dcaegen2-services-pm-mapper-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-          mvn-goals: 'clean install docker:build'
+          mvn-goals: "clean install docker:build"
       - gerrit-maven-merge:
-          mvn-goals: 'clean deploy'
+          mvn-goals: "clean deploy"
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean install docker:build docker:push'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean install docker:build docker:push"
 
 - project:
     name: dcaegen2-services-pm-mapper-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services/pm-mapper'
-    project-name: 'dcaegen2-services-pm-mapper'
-    branch: 'master'
+    project: "dcaegen2/services/pm-mapper"
+    project-name: "dcaegen2-services-pm-mapper"
+    branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-settings: "dcaegen2-services-pm-mapper-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-pm-mapper-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/pm-mapper
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-services-pm-mapper'
+    project-name: "dcaegen2-services-pm-mapper"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+    mvn-settings: "dcaegen2-services-pm-mapper-settings"
 
 - project:
     name: dcaegen2-services-pm-mapper-info
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
index a6bc305..974499e 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
@@ -1,15 +1,16 @@
+---
 - project:
     name: dcaegen2-services-pmsh-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
     project-name: dcaegen2-services-pmsh
-    recipients: 'lego@est.tech'
+    recipients: "lego@est.tech"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuite':
+      - "testsuite":
           trigger_jobs:
-            - '{project-name}-docker-merge-master'
-    robot-options: ''
+            - "{project-name}-docker-merge-master"
+    robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index c7fb73a..efb8dc1 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-services-prh
-    project-name: 'dcaegen2-services-prh'
+    project-name: "dcaegen2-services-prh"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -13,24 +13,24 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build docker:push'
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build docker:push"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dcaegen2/services/prh'
+    project: "dcaegen2/services/prh"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-prh-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    mvn-settings: "dcaegen2-services-prh-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -39,32 +39,32 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk11
-    project: 'dcaegen2/services/prh'
-    project-name: 'dcaegen2-services-prh'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-prh-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services/prh"
+    project-name: "dcaegen2-services-prh"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-prh-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-prh-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/prh
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk11
-    project-name: 'dcaegen2-services-prh'
+    project-name: "dcaegen2-services-prh"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-prh-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-prh-settings"
 
 - project:
     name: dcaegen2-services-prh-info
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 111399f..88b7775 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-services-sdk
-    project-name: 'dcaegen2-services-sdk'
+    project-name: "dcaegen2-services-sdk"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -11,22 +11,22 @@
           sbom-generator: false
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'dcaegen2/services/sdk'
+    project: "dcaegen2/services/sdk"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-sdk-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'centos8-docker-8c-8g'
+    mvn-settings: "dcaegen2-services-sdk-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "centos8-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -34,16 +34,16 @@
     name: dcaegen2-services-sdk-integration-pairwise
     java-version: openjdk11
     jobs:
-      - '{project-name}-{stream}-integration-pairwise':
+      - "{project-name}-{stream}-integration-pairwise":
           build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services/sdk'
-    project-name: 'dcaegen2-services-sdk'
+    project: "dcaegen2/services/sdk"
+    project-name: "dcaegen2-services-sdk"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-sdk-settings'
-    mvn-params: ' -P integration-pairwise'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-sdk-settings"
+    mvn-params: " -P integration-pairwise"
 
 - project:
     name: dcaegen2-services-sdk-sonar
@@ -51,31 +51,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-docker-8c-8g
-    project: 'dcaegen2/services/sdk'
-    project-name: 'dcaegen2-services-sdk'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-sdk-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services/sdk"
+    project-name: "dcaegen2-services-sdk"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-sdk-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-sdk-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/sdk
     build-node: centos8-docker-8c-8g
-    project-name: 'dcaegen2-services-sdk'
+    project-name: "dcaegen2-services-sdk"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-sdk-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-sdk-settings"
 
 - project:
     name: dcaegen2-services-sdk-info
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
index 8c57bea..4b22989 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
@@ -1,15 +1,16 @@
+---
 - project:
     name: dcaegen2-services-slice-analysis-ms-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-services-slice-analysis-ms'
-    recipients: 'vv770d@att.com ahila.pandaram@wipro.com niranjana.y60@wipro.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2-services-slice-analysis-ms"
+    recipients: "vv770d@att.com ahila.pandaram@wipro.com niranjana.y60@wipro.com"
     stream:
-      - 'master':
-           branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites':
+      - "testsuites":
           trigger_jobs:
-            - '{project-name}-{stream}-merge-java'
-    robot-options: ''
+            - "{project-name}-{stream}-merge-java"
+    robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 943f7ce..f822ab6 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -1,65 +1,65 @@
 ---
 - project:
     name: dcaegen2-services-slice-analysis-ms-verify
-    project-name: 'dcaegen2-services-slice-analysis-ms'
-    project: 'dcaegen2/services'
+    project-name: "dcaegen2-services-slice-analysis-ms"
+    project: "dcaegen2/services"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
       - gerrit-maven-merge
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    mvn-params: '-f components/slice-analysis-ms/pom.xml'
+    mvn-settings: "dcaegen2-services-settings"
+    container-public-registry: "nexus3.onap.org:10001"
+    container-staging-registry: "nexus3.onap.org:10003"
+    mvn-params: "-f components/slice-analysis-ms/pom.xml"
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/slice-analysis-ms/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    mvn-version: 'mvn36'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+        pattern: "components/slice-analysis-ms/**"
+    mvn-snapshot-id: "ecomp-snapshots"
+    mvn-version: "mvn36"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
 - project:
     name: dcaegen2-services-slice-analysis-ms-release
-    project-name: 'dcaegen2-services-slice-analysis-ms'
-    project: 'dcaegen2/services'
+    project-name: "dcaegen2-services-slice-analysis-ms"
+    project: "dcaegen2/services"
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          sbom-path: 'components/slice-analysis-ms/'
+          sbom-path: "components/slice-analysis-ms/"
           build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-          mvn-pom: 'components/slice-analysis-ms/pom.xml'
-          mvn-params: '-f components/slice-analysis-ms/pom.xml'
+          mvn-pom: "components/slice-analysis-ms/pom.xml"
+          mvn-params: "-f components/slice-analysis-ms/pom.xml"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-          mvn-params: '-f components/slice-analysis-ms/pom.xml'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+          mvn-params: "-f components/slice-analysis-ms/pom.xml"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
-    mvn-version: 'mvn36'
-    files: '**'
-    archive-artifacts: ''
+    mvn-settings: "dcaegen2-services-settings"
+    mvn-version: "mvn36"
+    files: "**"
+    archive-artifacts: ""
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'components/slice-analysis-ms/**'
-    build-node: 'ubuntu1804-docker-8c-8g'
+        pattern: "components/slice-analysis-ms/**"
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -69,30 +69,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-slice-analysis-ms'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
-    mvn-goals: 'clean install'
-    mvn-params: '-f components/slice-analysis-ms/pom.xml'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-slice-analysis-ms"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
+    mvn-goals: "clean install"
+    mvn-params: "-f components/slice-analysis-ms/pom.xml"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-slice-analysis-ms-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-services-slice-analysis-ms-clm'
-    mvn-params: '-f components/slice-analysis-ms/pom.xml'
+    project-name: "dcaegen2-services-slice-analysis-ms-clm"
+    mvn-params: "-f components/slice-analysis-ms/pom.xml"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
index 34b4a63..17683cf 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
@@ -1,15 +1,16 @@
+---
 - project:
     name: dcaegen2-services-son-handler-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-services-son-handler'
-    recipients: 'vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2-services-son-handler"
+    recipients: "vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites':
+      - "testsuites":
           trigger_jobs:
-            - '{project-name}-{stream}-merge-java'
-    robot-options: ''
+            - "{project-name}-{stream}-merge-java"
+    robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 59918b8..e80dd9d 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-services-son-handler
-    project-name: 'dcaegen2-services-son-handler'
+    project-name: "dcaegen2-services-son-handler"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -13,24 +13,24 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dcaegen2/services/son-handler'
+    project: "dcaegen2/services/son-handler"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-son-handler-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    mvn-settings: "dcaegen2-services-son-handler-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -40,31 +40,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services/son-handler'
-    project-name: 'dcaegen2-services-son-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-son-handler-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services/son-handler"
+    project-name: "dcaegen2-services-son-handler"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-son-handler-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-son-handler-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/son-handler
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-services-son-handler'
+    project-name: "dcaegen2-services-son-handler"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-son-handler-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-son-handler-settings"
 
 - project:
     name: dcaegen2-services-son-handler-info
diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml
index a63c073..4e0d0f2 100644
--- a/jjb/dcaegen2/dcaegen2-services.yaml
+++ b/jjb/dcaegen2/dcaegen2-services.yaml
@@ -12,7 +12,7 @@
     project-name: dcaegen2-services
     mvn-settings: dcaegen2-services-settings
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
     build-node: centos7-docker-2c-1g
     project: dcaegen2/services
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 6833c65..e87c077 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -1,60 +1,60 @@
 ---
 - project:
     name: dcaegen2-utils
-    project-name: 'dcaegen2-utils'
+    project-name: "dcaegen2-utils"
     python-version: python3
 
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-    project: 'dcaegen2/utils'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - "{project-name}-{stream}-release-version-java-daily"
+    project: "dcaegen2/utils"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dcaegen2-utils-settings'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dcaegen2-utils-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-utils-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/utils'
-    project-name: 'dcaegen2-utils'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-utils-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/utils"
+    project-name: "dcaegen2-utils"
+    branch: "master"
+    mvn-settings: "dcaegen2-utils-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-utils-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/utils
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-utils'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-utils-settings'
+    project-name: "dcaegen2-utils"
+    branch: "master"
+    mvn-settings: "dcaegen2-utils-settings"
 
 - project:
     name: dcaegen2-utils-info
@@ -85,7 +85,7 @@
     <<: *cbs_client_pypi_common
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+        pattern: "onap-dcae-cbs-docker-client/{name}/.*"
     jobs:
       - gerrit-pypi-verify
       - gerrit-pypi-merge:
diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 11f333a..91d09a5 100644
--- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -1,30 +1,31 @@
+---
 - project:
     name: dcaegen2-collectors-ves-testsuites-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2'
-    recipients: 'vv770d@att.com pawel.kasperkiewicz@nokia.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2"
+    recipients: "vv770d@att.com pawel.kasperkiewicz@nokia.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites'
+      - "testsuites"
     trigger_jobs:
-      - 'dcaegen2-collectors-ves-master-merge-java'
-    robot-options: ''
+      - "dcaegen2-collectors-ves-master-merge-java"
+    robot-options: ""
 - project:
     name: dcaegen2-prh-testsuites-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2'
-    recipients: 'vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "dcaegen2"
+    recipients: "vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'prh-testsuites'
+      - "prh-testsuites"
     trigger_jobs:
-      - 'dcaegen2-services-prh-master-merge-java'
-    robot-options: ''
+      - "dcaegen2-services-prh-master-merge-java"
+    robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index e1f6ca0..0ce5531 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -7,40 +7,40 @@
 
 - project:
     name: dcaegen2
-    project-name: 'dcaegen2'
+    project-name: "dcaegen2"
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
       - gerrit-maven-merge
 
-    project: 'dcaegen2'
+    project: "dcaegen2"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-      - 'jakarta':
-          branch: 'jakarta'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    mvn-settings: 'dcaegen2-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+      - "jakarta":
+          branch: "jakarta"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    mvn-settings: "dcaegen2-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     name: dcaegen2-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'dcaegen2'
-    project-name: 'dcaegen2'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-settings'
+    nexus-iq-namespace: "onap-"
+    project: "dcaegen2"
+    project-name: "dcaegen2"
+    branch: "master"
+    mvn-settings: "dcaegen2-settings"
 
 - project:
     name: dcaegen2-info