diff --git a/global-jjb b/global-jjb
index ff69c5d..f56fb39 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit ff69c5d06f4d27f3784bd56c6006e380c95f797f
+Subproject commit f56fb3983c20cf5256a544350ac7f7eced1a0045
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
new file mode 100644
index 0000000..9d65184
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190507-002922.623
+LABELS=centos7-docker-8c-8g
+HARDWARE_ID=v2-highcpu-8
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 1f5d8cc..3b6337d 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -16,8 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 6245489..3f5e6e4 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index fde02ce..06edc0c 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -15,8 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index dbb60b9..fc7fdab 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/chameleon'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-chameleon-settings'
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 59d9580..fb5a3ab 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -20,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-champ-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index eb7f5bb..5f49aef 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/data-router'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-data-router-settings'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 583e321..6f9d561 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-esr-gui-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 250969c..21567fb 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-esr-server-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 3ba2992..3b29da3 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/event-client'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index 3f79530..1f575ea 100644
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -12,8 +12,8 @@
           build-node: 'ubuntu1604-docker-8c-8g'
     project: 'aai/gallifrey'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-gallifrey-settings'
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 530def2..76ba0ea 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/gizmo'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-gizmo-settings'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index efab1a8..646e853 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index b1b4c7a..31cedd1 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -11,6 +11,13 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+          build-node: ubuntu1604-docker-2c-4g
+
     project: 'aai/graphgraph'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 53fe21c..ac64c91 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/logging-service'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index a459e50..0546abc 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index 9e2b4e4..816ecff 100644
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -33,8 +33,5 @@
         #!/bin/bash
         cd kubernetes/
         make common
-        make {subproject}
+        make {helm-module}
     oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-    subproject:
-      - 'aai':
-          files: 'kubernetes/aai/**'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 787b453..96234eb 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index bbb1574..a6fd5a1 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/rest-client'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index e4d0745..92e3e24 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -14,8 +14,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/router-core'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index fddc4da..a111ffd 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -19,8 +19,8 @@
     project: 'aai/search-data-service'
     docker-image-name: 'onap/search-data-service'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 4b3bc44..373a1aa 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 596eeaf..c75d5bf 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -9,8 +9,8 @@
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/sparky-fe'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index ca8d585..7f01185 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/spike'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-spike-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 9927db5..26c8713 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index a5dd70b..52dc8af 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -18,8 +18,8 @@
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/validation'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-validation-settings'
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index c31a51d..d66a902 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -5,13 +5,17 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'appc/cdt'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 027e181..220e3cf 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -6,7 +6,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-docker-image-blessing'
 
@@ -14,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
@@ -50,6 +55,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index d623f83..71e3700 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -7,7 +7,10 @@
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
           build-node: ubuntu1604-builder-8c-8g
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily':
           build-node: ubuntu1604-builder-8c-8g
 
@@ -15,6 +18,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 8733f80..efb25d0 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -11,13 +11,17 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'appc/parent'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'appc-parent-settings'
     build-node: ubuntu1604-builder-2c-1g
 
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 704e242..9ee4277 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -3,9 +3,7 @@
     name: ccsdk-project-view
     project-name: ccsdk
     views:
-      - common-view
-    view-name: ccsdk
-    view-regex: '(?!.*-maven-stage-)(ccsdk-.*)$'
+      - project-view
 
 - project:
     name: ccsdk-apps
@@ -24,6 +22,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-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
@@ -59,6 +59,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
     build-node: ubuntu1604-builder-4c-4g
 
@@ -74,6 +76,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 2890a4e..c97d193 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -10,6 +10,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 2ca06f5..4217854 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-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
@@ -47,6 +49,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1604-builder-4c-4g
 
@@ -60,6 +64,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index bcac3f5..c3f6d0e 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -5,12 +5,16 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/dashboard'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-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
@@ -44,6 +48,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
@@ -57,6 +63,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 9cb8dbf..ce8015e 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -15,6 +15,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -34,6 +36,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -70,6 +74,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1604-docker-8c-8g
 
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index bab3161..3950c98 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-features-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
@@ -51,6 +53,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
     build-node: ubuntu1604-builder-4c-4g
 
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 33c7c23..c0d576b 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-parent-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
@@ -37,6 +39,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
     build-node: ubuntu1604-builder-4c-4g
 
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index e7a251c..b024a7a 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-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
@@ -51,6 +53,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     build-node: centos7-redis-4c-4g
 
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 0e316b8..1b3237f 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-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
@@ -51,6 +53,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     build-node: ubuntu1604-builder-4c-4g
 
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 4aa34ca..a3feadd 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-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
@@ -51,6 +53,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
     build-node: ubuntu1604-builder-4c-4g
 
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index df87a7f..66c753b 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-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
@@ -51,6 +53,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     build-node: ubuntu1604-builder-4c-4g
 
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 63ce70d..290cb9b 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-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
@@ -50,6 +52,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
 
 
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 8129c40..5c5e316 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -16,6 +16,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-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
@@ -37,6 +39,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
 
 
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index f4f46f3..081392c 100644
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -32,6 +32,7 @@
     build-timeout: 90
 
     platforms:
+      - centos-7
       - ubuntu-16.04
       - ubuntu-16.04-arm64
     templates: docker
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index fc3522d..d32d4b9 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -7,7 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
index ae5b038..6740dae 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
@@ -4,7 +4,11 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-collectors-datafile'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'ManagementInterface-suite':
           trigger_jobs:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index dc4b98b..7f06524 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 749d01e..7108503 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index a328fd6..3a574a5 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 44faf9b..1be5726 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     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
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 0ef35e6..79dab04 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index eb7a8fd..d7bc964 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     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
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index f1943d4..5dee646 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 6d35e18..285d4e0 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
new file mode 100644
index 0000000..86759fe
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
@@ -0,0 +1,23 @@
+---
+- project:
+    name: dcaegen2-platform-cli-bp-gen
+    project: 'dcaegen2/platform/cli'
+    project-name: 'dcaegen2-platform-cli'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'blueprint-generator/version.properties'
+    subproject:
+      - 'blueprint-gen':
+          pom: 'blueprint-generator/pom.xml'
+          pattern: 'blueprint-generator/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cli-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 4b161fb..8f753b4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 8f2c351..b6bb261 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 385274b..d33b745 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 489cb01..3909a23 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-plugins-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index a93fd57..cb19425 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index 559370c..94e7e2e 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
@@ -7,8 +7,10 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:
-            - 'dcaegen2-services-master-bbs-event-processor-merge-java'
+            - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java'
     robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 670cbd8..2e49ee5 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -6,7 +6,8 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'components/bbs-event-processor/version.properties'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
@@ -14,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 2d89736..1c5ad80 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -6,7 +6,8 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
+            version-properties: 'components/datalake-handler/version.properties'
     subproject:
       - 'datalake-handler':
           pom: 'components/datalake-handler/pom.xml'
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index ff7f9ae..3527ffd 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     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
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index c5fc0d4..e319e68 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 70302c1..0d6687f 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
index 38216d1..1d4bcf2 100644
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
@@ -4,7 +4,12 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-pmmapper'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+
     functionality:
       - 'pmmapper':
           trigger_jobs:
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index b49c360..8e3047f 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 1c91870..2c12df9 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 0e637f3..b4d2b5c 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 4e579b6..d91b378 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 2d11c7f..4c610e1 100644
--- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs:
@@ -21,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'prh-testsuites'
     trigger_jobs:
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index bb8a2e9..46ccfc3 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -17,8 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index e43a8a2..b86e653 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -47,6 +47,7 @@
 
     # git submodule attributes
     submodule-recursive: true
+    submodule-disable: false
 
     # Jenkins
     jenkins-ssh-credential: onap-jenkins-ssh
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index b7a56af..c783015 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -487,6 +487,15 @@
             </org.jenkinsci.plugins.golang.GolangBuildWrapper>
 
 - wrapper:
+    name: golang112
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.12</goVersion>
+            </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
+- wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
     name: infra-wrappers
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index db3d4cf..1c8242f 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -24,6 +24,7 @@
     # Default to LF standard 'snapshots' docker registry
     docker_registry: '$DOCKER_REGISTRY:10003'
     docker_tag: 'latest'
+    submodule-disable: false
     submodule-timeout: 10
 
     #####################
@@ -280,6 +281,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
@@ -340,6 +342,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
@@ -560,6 +563,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
@@ -620,6 +624,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
@@ -677,6 +682,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
@@ -729,6 +735,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index f5c6bcd..12ce9a3 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -17,6 +17,7 @@
     git-url: '$GIT_URL/$PROJECT'
     post_build_script: ''
     pre_build_script: ''
+    submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
 
@@ -129,6 +130,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
@@ -168,6 +170,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
@@ -272,6 +275,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 517643e..11b90ae 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -11,7 +11,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
 
     project: 'holmes/common'
     stream:
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 06315de..0279d4e 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -5,7 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 089a55f..df26710 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -5,7 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index 70804c4..a7fe916 100644
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - 'functionality1':
           trigger_jobs:
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 6bdf288..8fea30f 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -9,8 +9,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     subproject:
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 03480ee..714878e 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -11,7 +11,12 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'version-manifest/pom.xml'
+          mvn-params: '-f version-manifest/pom.xml'
     project: 'integration'
     subproject:
       - 'version-manifest':
@@ -20,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
@@ -38,8 +41,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'integration-settings'
 
 - project:
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index bf27f50..2dd843f 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index 43c4afc..2fbfff6 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
     project: logging-analytics/pomba/pomba-audit-common
     stream:
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 6f2238a..091b9a4 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 15b1a42..f41625f 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index 71fbb33..5bc97bb 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index 3feabec..cd1d05c 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 0e5919f..95de71c 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -11,6 +11,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
@@ -79,6 +83,10 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
     files: '**'
diff --git a/jjb/modeling/build-modeling-genericparser-docker-image.sh b/jjb/modeling/build-modeling-genericparser-docker-image.sh
new file mode 100644
index 0000000..d570d18
--- /dev/null
+++ b/jjb/modeling/build-modeling-genericparser-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh
+
diff --git a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
new file mode 100644
index 0000000..032881c
--- /dev/null
+++ b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: modeling-genericparser-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'modeling-genericparser'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
\ No newline at end of file
diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml
new file mode 100644
index 0000000..f21e60c
--- /dev/null
+++ b/jjb/modeling/modeling-toscaparsers-genericparser.yaml
@@ -0,0 +1,60 @@
+---
+
+- project:
+    name: modeling-genericparser
+    project-name: 'modeling-genericparser'
+    project: 'modeling/genericparser'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'modeling-genericparser-settings'
+    subproject:
+      - 'genericparser':
+          path: '.'
+          pattern: '**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-modeling-genericparser-docker-image.sh'
+          build-node: ubuntu1604-docker-8c-8g
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-redis-4c-4g
+
+- project:
+    name: modeling-genericparser-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: centos7-redis-4c-4g
+    project: 'modeling/genericparser'
+    project-name: 'modeling-genericparser'
+    branch: 'master'
+    mvn-settings: 'modeling-genericparser-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: modeling-genericparser-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: modeling/genericparser
+    project-name: 'modeling-genericparser'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'modeling-genericparser-settings'
+
+- project:
+    name: modeling-genericparser-info
+    project-name: modeling-genericparser
+    jobs:
+      - gerrit-info-yaml-verify
+    project: modeling/genericparser
+    branch: master
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index 10c8d3e..b90b929 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -16,6 +16,10 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 14ebfc3..c2b72cf 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -15,6 +15,10 @@
           pom: 'artifactbroker/pom.xml'
           pattern: 'artifactbroker/**'
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 5825658..d4aa0be 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -3,7 +3,7 @@
     name: multicloud-k8s
     project-name: 'multicloud-k8s'
     path: 'src/k8splugin'
-    golangver: 'golang111'
+    golangver: 'golang112'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-golang'
@@ -28,7 +28,7 @@
 #    name: multicloud-k8s-arm64
 #    project-name: 'multicloud-k8s-arm64'
 #    path: 'src/k8splugin'
-#    golangver: 'golang111'
+#    golangver: 'golang112'
 #    jobs:
 #      - '{project-name}-{stream}-docker-golang-shell-daily':
 #          script:
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 8a1ec57..40c79e6 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -16,6 +16,10 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
index 972535e..0066522 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -14,6 +14,10 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index c9151f7..9947419 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -62,6 +62,10 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
index 957a55e..cd0e246 100644
--- a/jjb/music/music-mdbc.yaml
+++ b/jjb/music/music-mdbc.yaml
@@ -5,6 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'music/mdbc'
     stream:
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index c0369a4..7025c95 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -5,7 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: docker
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 129ece3..816f83c 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -11,7 +11,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: docker
@@ -21,8 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index e526603..9de048c 100644
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -20,6 +20,7 @@
       - compare-type: ANT
         pattern: '**'
 
+    submodule-disable: false
     submodule-timeout: 10
 
     #####################
@@ -52,6 +53,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     wrappers:
diff --git a/jjb/oom/include-yaml-check.sh b/jjb/oom/include-yaml-check.sh
deleted file mode 100755
index 27359e5..0000000
--- a/jjb/oom/include-yaml-check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# setting-up bash flags
-set -x -e -o pipefail
-
-# remove old ansible - current centos build minion
-# is quite old and using incompatible ansible 2.4.x
-sudo yum -y remove ansible
-sudo pip install ansible ansible-lint
-
-# perform check
-ansible --version
-ansible-lint --version
-ansible-lint ./ansible/site.yml -vvv
diff --git a/jjb/oom/offline-installer-review-bootstrap.sh b/jjb/oom/offline-installer-review-bootstrap.sh
new file mode 100644
index 0000000..f8454d2
--- /dev/null
+++ b/jjb/oom/offline-installer-review-bootstrap.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# setting-up bash flags
+set -x -e -o pipefail
+
+#Run review script
+./offline-installer-review.sh
+
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index ca2f15f..7e462d2 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -2,13 +2,13 @@
 - project:
     name: offline-installer
     project-name: 'offline-installer'
-    build-node: centos7-builder-2c-1g
-    offline_build_script: !include-raw-escape: include-yaml-check.sh
+    build-node: 'ubuntu1604-docker-8c-8g'
+    offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
 
     stream:
       - 'master':
           branch: 'master'
 
     jobs:
-      - '{project-name}-{stream}-yaml-lint':
-          build_script: '{offline_build_script}'
+      - '{project-name}-{stream}-review':
+          build_script: '{offline_review_bootstrap}'
diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml
index 02eae3f..5f95f70 100644
--- a/jjb/oom/oom-jobs.yaml
+++ b/jjb/oom/oom-jobs.yaml
@@ -1,8 +1,8 @@
 ---
 - job-template:
-    name: '{project-name}-{stream}-yaml-lint'
+    name: '{project-name}-{stream}-review'
     node: '{build-node}'
-    type: freestyle
+    project-type: freestyle
     build_script: ''
     pattern: '**'
 
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index d57df1f..b5f9150 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -11,13 +11,14 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
     project: 'oparent'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'oparent-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 093ed28..5b240f4 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -9,16 +9,14 @@
     name: optf-cmso
     project-name: 'optf-cmso'
     jobs:
+      - gerrit-maven-stage:
+          maven-versions-plugin: true
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DoSetVersion'
-         mvn_properties:
-          - docker.pull.registry=nexus3.onap.org:10001
       - '{project-name}-{stream}-docker-java-properties-daily':
          setVersion: 'DoSetVersion'
          docker-pom: 'pom.xml'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 7660a2e..50a8035 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -17,7 +17,10 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 27d6fce..0949850 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -16,7 +16,10 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index d81eccd..f23b9c1 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -21,7 +21,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/apex-pdp'
     stream:
@@ -48,7 +48,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/apex-pdp'
     stream:
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index cb483ac..9462909 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -12,7 +12,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/api'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index a847382..ccf6c75 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -6,7 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          disabled: false
 
     project: 'policy/common'
     stream:
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index e2245cd..cedbc64 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'health'
     trigger_jobs:
@@ -16,6 +14,7 @@
       - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
+    build-timeout: 40
     branch: 'master'
 
 - project:
@@ -27,8 +26,6 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'apex-pdp'
     trigger_jobs:
@@ -45,8 +42,6 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'distribution'
     trigger_jobs:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index a8cc463..6c5753c 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -12,7 +12,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'
@@ -37,7 +37,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 97cc6ab..bab2c2e 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -15,7 +15,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'drools-apps-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/drools-applications'
@@ -34,7 +34,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
+          disabled: true
 
     project: 'policy/drools-applications'
     stream:
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index c3c89bd..c7ab5c2 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -15,7 +15,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/drools-pdp'
     stream:
@@ -42,7 +42,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/drools-pdp'
     stream:
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index f7a2450..114adb7 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -15,7 +15,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/engine'
     stream:
@@ -42,7 +42,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/engine'
     stream:
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 92008ec..b7507ab 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -5,6 +5,8 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily':
+          disabled: false
 
     project: 'policy/models'
     stream:
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index e7d3102..e33bb23 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -12,7 +12,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/pap'
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 44498e5..22c1edf 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -6,7 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          disabled: false
 
     project: 'policy/parent'
     stream:
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 462853a..1ad7b7a 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -12,7 +12,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/xacml-pdp'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index e125984..ce944dd 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -9,6 +9,10 @@
     name: portal
     project-name: 'portal'
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-java-daily'
     project: 'portal'
     stream:
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 1af6474..7ec4294 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'sanity':
           trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 52547b2..0cd41f1 100644
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     files: '**'
     archive-artifacts: ''
@@ -52,7 +54,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/ci'
     project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -65,7 +67,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/ci
     project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 70efc84..b6e5384 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''
@@ -47,7 +49,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-main'
     project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -60,7 +62,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/dt-be-main
     project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index 08044a1..7bc3c34 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -10,6 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     files: '**'
     archive-artifacts: ''
@@ -23,7 +25,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-property'
     project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -36,7 +38,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/dt-be-property
     project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index ee6eec0..9b83d0b 100644
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''
@@ -48,7 +50,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt'
     project-name: 'sdc-dcae-d-dt'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -62,7 +64,7 @@
     project: sdc/dcae-d/dt
     project-name: 'sdc-dcae-d-dt'
     build-node: ubuntu1604-builder-4c-2g
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 4f459d5..67f00ec 100644
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''
@@ -47,7 +49,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/fe'
     project-name: 'sdc-dcae-d-fe'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -61,7 +63,7 @@
     project: sdc/dcae-d/fe
     project-name: 'sdc-dcae-d-fe'
     build-node: ubuntu1604-builder-4c-2g
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index 397b829..e718024 100644
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     subproject:
     - dcae-d-tosca-lab:
         path: '.'
@@ -46,7 +48,7 @@
     build-node: ubuntu1604-docker-8c-8g
     project: 'sdc/dcae-d/tosca-lab'
     project-name: 'sdc-dcae-d-tosca-lab'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index bda26b7..090c215 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
@@ -30,7 +32,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/jtosca'
     project-name: 'sdc-jtosca'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -43,7 +45,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/jtosca
     project-name: 'sdc-jtosca'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-jtosca-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 273fda7..03b9d2a 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index f94773a..b39c9c8 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
@@ -31,7 +33,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-pubsub'
     project-name: 'sdc-sdc-pubsub'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index f1ef58c..c862ffc 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
@@ -30,7 +32,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-tosca'
     project-name: 'sdc-sdc-tosca'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -43,7 +45,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-tosca
     project-name: 'sdc-sdc-tosca'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
 
 - project:
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index b204229..dcea026 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -19,6 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
@@ -53,7 +55,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
     project-name: 'sdc-sdc-workflow-designer'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -67,7 +69,7 @@
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
 
 - project:
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a6e2dd5..7d70a7e 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -45,6 +45,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
@@ -77,7 +79,7 @@
     build-node: ubuntu1604-builder-8c-8g
     project: 'sdc'
     project-name: 'sdc'
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-settings'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
@@ -94,7 +96,7 @@
     project: sdc
     project-name: 'sdc'
     build-node: ubuntu1604-docker-8c-8g
-    branch: 'master'
+    branch: 'dublin'
     mvn-settings: 'sdc-settings'
 
 - project:
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 85242ba..3cba3d9 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -20,6 +20,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -58,6 +60,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
     files: '**'
     archive-artifacts: ''
@@ -93,6 +97,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
 
 - project:
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index dd76bd4..285f0f0 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 4bc5abe..32ed192 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -14,6 +14,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -51,6 +53,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
 
 - project:
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 5e9add5..f6eb04c 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -14,6 +14,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -33,6 +35,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -68,6 +72,8 @@
           branch: 'master'
       - 'casablanca':
           branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
 
 - project:
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index b194d85..47a8e7f 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     functionality:
       - 'integration-testing':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 13f9a9e..f39545d 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -10,8 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'so-libs-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
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 5ba7b2d..e69cb5b 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
@@ -52,8 +52,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'so-settings'
 
 - project:
diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh
index d29d43c..ca5e95a 100644
--- a/jjb/testsuite/testsuite-docker.sh
+++ b/jjb/testsuite/testsuite-docker.sh
@@ -4,7 +4,11 @@
 cp $WORKSPACE/docker/* .
 docker -D build -t onap/testsuite .
 export REPO="nexus3.onap.org:10003"
-for tag in $tags
+
+DATETIME_STAMP=$(date +%Y%m%dT%H%M%S)
+STAGING_TAG=${base_version}-STAGING-${DATETIME_STAMP}Z
+
+for tag in $tags $STAGING_TAG
 do
   docker tag onap/testsuite:latest $REPO/onap/testsuite:$tag
   docker push $REPO/onap/testsuite:$tag
diff --git a/jjb/testsuite/testsuite-heatbridge-release.yaml b/jjb/testsuite/testsuite-heatbridge-release.yaml
deleted file mode 100644
index cf46f14..0000000
--- a/jjb/testsuite/testsuite-heatbridge-release.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- project:
-    name: testsuite-heatbridge-release
-    project-name: 'testsuite-heatbridge'
-    subproject:
-      - heatbridge:
-          path: '.'
-          pattern: '**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-
-    project: 'testsuite/heatbridge'
-
-    stream:
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'testsuite-heatbridge-settings'
diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
similarity index 95%
rename from jjb/testsuite/testsuite-heatbridge-master.yaml
rename to jjb/testsuite/testsuite-heatbridge.yaml
index fd6ec4c..20ba913 100644
--- a/jjb/testsuite/testsuite-heatbridge-master.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index e69be71..db8c90c 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -2,18 +2,37 @@
 - project:
     name: testsuite-python-testing-utils
     project-name: 'testsuite-python-testing-utils'
-    subproject:
-      - python-testing-utils:
-          path: '.'
-          pattern: '**'
+    python-version: python2
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
     project: 'testsuite/python-testing-utils'
+    subproject:
+      - 'robotframework-onap':
+          tox-dir: robotframework-onap/
+          tox-envs: ''
 
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+    mvn-settings: 'testsuite-python-testing-utils-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-builder-4c-4g'
+
+- project:
+    name: testsuite-python-testing-utils-master-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: testsuite/python-testing-utils
+    project-name: 'testsuite-python-testing-utils'
+    build-node: 'ubuntu1604-builder-4c-4g'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'testsuite-python-testing-utils-settings'
 
 - project:
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index c573c70..0b1e6cb 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -16,13 +16,13 @@
     project: 'testsuite'
 
     extra-project1: 'testsuite/python-testing-utils'
-    extra-branch1: 'master'
-    extra-refspec1: 'refs/heads/master'
+    extra-branch1: '{branch}'
+    extra-refspec1: 'refs/heads/{branch}'
     checkout-dir1: 'testsuite/eteutils'
 
     extra-project2: 'testsuite/heatbridge'
-    extra-branch2: 'master'
-    extra-refspec2: 'refs/heads/master'
+    extra-branch2: '{branch}'
+    extra-refspec2: 'refs/heads/{branch}'
     checkout-dir2: 'testsuite/heatbridge'
 
     extra-project3: 'demo'
@@ -33,8 +33,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'testsuite-settings'
 
 - project:
diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
index ee8effe..ce90c49 100644
--- a/jjb/usecases/5G-bulkpm.yaml
+++ b/jjb/usecases/5G-bulkpm.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
       - 'casablanca':
           branch: 'casablanca'
     functionality:
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index c4643e5..23afa74 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - 'healthCheck':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 9736280..3b812c7 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -11,14 +11,16 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     project: 'vid'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
@@ -35,8 +37,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh
index c5fb7b6..da1d5e2 100644
--- a/jjb/vnfrqts/pre-build-needs.sh
+++ b/jjb/vnfrqts/pre-build-needs.sh
@@ -5,5 +5,4 @@
 pip install --upgrade pip
 pip install -r etc/requirements.txt
 ls
-wget -O $WORKSPACE/docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
 tox -e needs
\ No newline at end of file
diff --git a/packer/common-packer b/packer/common-packer
index 68cc818..ec01814 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 68cc818abbb50411023d70149d97a52bba1d8456
+Subproject commit ec01814071eaea55ea7b025308b58d3923897eb6
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 37ca313..f3af621 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -58,10 +58,11 @@
         name: libxml2-utils
         state: present
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install python-tox
-      apt:
-        name: python-tox
+      pip:
+        name: tox
         state: present
       become: true
 
@@ -69,12 +70,14 @@
         repo: ppa:jonathonf/python-3.6
         state: present
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Update and upgrade apt packages
       apt:
         upgrade: yes
         update_cache: yes
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install Python 3.6 and packages
       apt:
@@ -85,6 +88,7 @@
           - libmysqlclient-dev
           - gcc
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install base packages
       apt:
@@ -100,6 +104,7 @@
           - libssl-dev
           - libffi-dev
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install autorelease support packages
       apt:
@@ -110,29 +115,31 @@
           - maven
           - python-ncclient
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome key
       apt_key:
         url: https://dl-ssl.google.com/linux/linux_signing_key.pub
         state: present
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome repo
       copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Update apt cache
       apt: update_cache=yes
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install Google Chrome
       apt:
         name: google-chrome-stable
         state: present
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install Erlang dependency packages
       apt:
@@ -141,26 +148,26 @@
           - libsctp1
           - libwxbase3.0-0v5
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install Erlang
       apt:
         deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
       install_recommends: yes
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Clone rebar3
       git:
         repo: 'https://github.com/erlang/rebar3.git'
         dest: /tmp/rebar3
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Bootstrap rebar3
       command: ./bootstrap
       args:
         chdir: /tmp/rebar3
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install rebar3 to bin
       copy:
@@ -169,13 +176,13 @@
         mode: 0755
         remote_src: true
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Remove unused rebar3 source
       file:
         path: /tmp/rebar3
         state: absent
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Download geckodriver
       unarchive:
@@ -184,7 +191,7 @@
         mode: 0755
         remote_src: yes
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Download Firefox version 55.0.3
       unarchive:
@@ -192,13 +199,13 @@
         dest: /opt
         mode: 0755
         remote_src: yes
-      when: "'x86_64' in ansible_architecture"
       become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Create symbolic link to firefox bin
       file:
         src: "/opt/firefox/firefox"
         dest: "/usr/bin/firefox"
         state: link
-      when: "'x86_64' in ansible_architecture"
       become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'