diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 59c7312..5d1e47f 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -1,17 +1,13 @@
 ---
 - project:
     name: dcaegen2-platform-mod-designtool
-    project-name: dcaegen2-platform-mod
+    project-name: dcaegen2-platform-mod-designtool
     # git repo
     project: dcaegen2/platform
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - designtool:
-          pom: 'mod/designtool/pom.xml'
-          pattern: 'mod/designtool/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
@@ -20,6 +16,13 @@
       - 'jakarta':
           branch: 'jakarta'
     mvn-settings: dcaegen2-platform-settings
+    container-public-registry: 'nexus3.onap.org:10001'
+    container-staging-registry: 'nexus3.onap.org:10003'
+    mvn-goals: 'clean package install'
+    mvn-params: '-f mod/designtool/pom.xml'
+    pattern: 'mod/designtool/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index 2787f50..d5e8ecd 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -1,17 +1,13 @@
 ---
 - project:
     name: dcaegen2-platform-mod-genprocessor
-    project-name: dcaegen2-platform-mod
+    project-name: dcaegen2-platform-mod-genprocessor
     # git repo
     project: dcaegen2/platform
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - genprocessor:
-          pom: 'mod/genprocessor/pom.xml'
-          pattern: 'mod/genprocessor/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
@@ -20,6 +16,13 @@
       - 'jakarta':
           branch: 'jakarta'
     mvn-settings: dcaegen2-platform-settings
+    container-public-registry: 'nexus3.onap.org:10001'
+    container-staging-registry: 'nexus3.onap.org:10003'
+    mvn-goals: 'clean package install'
+    mvn-params: '-f mod/genprocessor/pom.xml'
+    pattern: 'mod/genprocessor/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index d4e41d6..fb6f727 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -1,17 +1,13 @@
 ---
 - project:
     name: dcaegen2-platform-mod-runtimeapi
-    project-name: dcaegen2-platform-mod
+    project-name: dcaegen2-platform-mod-runtimeapi
     # git repo
     project: dcaegen2/platform
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - runtimeapi:
-          pom: 'mod/runtimeapi/pom.xml'
-          pattern: 'mod/runtimeapi/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
@@ -21,6 +17,13 @@
           branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
+    container-public-registry: 'nexus3.onap.org:10001'
+    container-staging-registry: 'nexus3.onap.org:10003'
+    mvn-goals: 'clean package install'
+    mvn-params: '-f mod/runtimeapi/pom.xml'
+    pattern: 'mod/runtimeapi/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
index a34faf3..26ffa5f 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
@@ -1,26 +1,19 @@
 ---
 - project:
     name: dcaegen2-platform-mod2-helm-generator
-    project-name: dcaegen2-platform-mod2
+    project-name: dcaegen2-platform-mod2-helm-generator
     # git repo
     project: dcaegen2/platform
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
       - gerrit-maven-stage:
-          project-name: dcaegen2-platform-mod2-helm-generator
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
           version-properties-file: 'mod2/helm-generator/version.properties'
           mvn-pom: 'mod2/helm-generator/pom.xml'
-          mvn-params: '-f mod2/helm-generator/pom.xml'
-          pattern: 'mod2/helm-generator/**'
-    subproject:
-      - helm-generator:
-          pom: 'mod2/helm-generator/pom.xml'
-          pattern: 'mod2/helm-generator/**'
     stream:
       - 'master':
           branch: 'master'
@@ -28,6 +21,12 @@
           branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
+    container-public-registry: 'nexus3.onap.org:10001'
+    container-staging-registry: 'nexus3.onap.org:10003'
+    mvn-params: '-f mod2/helm-generator/pom.xml'
+    pattern: 'mod2/helm-generator/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-version: 'mvn35'
     maven-deploy-properties: |
       deployAtEnd=true
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index e7b05d2..4a4d3d0 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,15 +1,12 @@
 ---
 - project:
-    name: dcaegen2-services-datalake-handler
+    name: dcaegen2-services-datalake-handler-verify-merge
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    subproject:
-      - 'datalake-handler':
-          pom: 'components/datalake-handler/pom.xml'
-          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
@@ -20,6 +17,12 @@
     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'
+    pattern: 'components/datalake-handler/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index e040b72..db98a33 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -1,15 +1,12 @@
 ---
 - project:
     name: dcaegen2-services-slice-analysis-ms-verify
-    project-name: 'dcaegen2-services'
+    project-name: 'dcaegen2-services-slice-analysis-ms'
     project: 'dcaegen2/services'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    subproject:
-      - 'slice-analysis-ms':
-          pom: 'components/slice-analysis-ms/pom.xml'
-          pattern: 'components/slice-analysis-ms/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
@@ -19,6 +16,12 @@
           branch: 'jakarta'
     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'
+    pattern: 'components/slice-analysis-ms/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'