diff --git a/global-jjb b/global-jjb
index f517210..3b12327 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit f5172109fc4ca477ad8e4764f41ef03f43fe0956
+Subproject commit 3b12327f7116727b4c19a8465589869a6add032b
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 1bd5189..201ae92 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190912-234852.235
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 1fea53c..4be9cf2 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190912-234852.235
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index 33e096f..e19e146 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190610-221311.883
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190912-234755.337
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 4fb913d..7b124aa 100644
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -1,3 +1,5 @@
+CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003
+CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002
 DOCKER_REGISTRY=nexus3.onap.org
 DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.onap.org/r
diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 0e5d1c5..146fe6e 100644
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -1,3 +1,5 @@
+CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003
+CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002
 DOCKER_REGISTRY=nexus3.onap.org
 DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.onap.org/r
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index efad526..5531462 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
           build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 13a1c5c..51fec37 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -15,7 +15,7 @@
           build-node: ubuntu1604-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 71e05e0..10a433b 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/babel'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index fa5f487..eaf3e8f 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -15,7 +15,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/cacher'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index 031e3f0..c20c2f9 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/chameleon'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ac7a911..b6a029f 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/champ'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 4e9c16c..0b3abdf 100644
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'aai'
+    disabled: true
     stream:
       - 'master':
           branch: master
@@ -16,4 +17,3 @@
       - 'esr-server':
           trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily'
     robot-options: ''
-
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index eb918b2..1270de4 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/data-router'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 2c0df6f..c32692d 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/esr-gui'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 695d3cc..2c9d996 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/esr-server'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 4c373c0..662966d 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/event-client'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index 2a3593d..7799d91 100644
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -15,7 +15,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/gallifrey'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 170971e..b22b905 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/gizmo'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 5c08eea..71ab03a 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/graphadmin'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index fb6f87b..27e097e 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -18,7 +18,7 @@
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/graphgraph'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index a15128d..bd17d25 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 86505f4..6262169 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 959d441..0477982 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/resources'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index d2871b3..568218c 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index da8c568..1b2b68f 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/router-core'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 77a9c6f..9252e4d 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/schema-service'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 0e630c1..945f6dc 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/search-data-service'
     docker-image-name: 'onap/search-data-service'
     stream:
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a1a68d6..6835f73 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index e17dcaf..c24f517 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -10,7 +10,7 @@
           build-node: ubuntu1604-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index d1a19ab..48e9206 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/spike'
     stream:
       - 'elalto':
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 33934c6..4453c46 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/traversal'
     stream:
       - 'master':
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 779f916..1168c32 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/validation'
     stream:
       - 'elalto':
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 9378e74..2f12135 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'appc/cdt'
     stream:
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 3d16d22..7622698 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -18,7 +18,7 @@
       - '{project-name}-{stream}-release-version-java-daily':
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'appc'
     stream:
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index fa63bb2..7a931c0 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'appc/parent'
     stream:
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 89eb16c..c62fb3b 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -21,12 +21,14 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     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
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 8aab71f..885329c 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -17,12 +17,14 @@
           maven-version: "mvn35"
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/cds'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     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
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 1236fcd..cdb6f2a 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -8,7 +8,7 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/dashboard'
     stream:
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index a35bd5c..e837a7f 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -17,13 +17,15 @@
           maven-version: "mvn35"
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -75,6 +77,7 @@
 - project:
     name: ccsdk-distribution-whitesource
     project-name: ccsdk-distribution
+    build-node: ubuntu1604-builder-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 79e6d14..1560b48 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -9,12 +9,14 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     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
@@ -64,6 +66,7 @@
 
 - project:
     name: ccsdk-features-whitesource
+    build-node: ubuntu1604-builder-8c-8g
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index c5eb108..cd04db7 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -11,7 +11,7 @@
           sign-artifacts: true
           cron: ''
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -21,6 +21,8 @@
           branch: 'master'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
+      - 'elalto':
+          branch: 'elalto'
     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
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index e9b6ebd..ab64976 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -9,7 +9,7 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/platform/plugins'
     stream:
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index be925d5..bb05ee3 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -9,7 +9,7 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/sli/adaptors'
     stream:
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
+      - 'elalto':
+          branch: 'elalto'
     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
@@ -67,6 +69,7 @@
 
 - project:
     name: ccsdk-sli-adaptors-whitesource
+    build-node: ubuntu1604-builder-8c-8g
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-whitesource-scan
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index a3a092a..a6415b6 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -9,7 +9,7 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/sli/core'
     stream:
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
+      - 'elalto':
+          branch: 'elalto'
     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
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 6315c90..54de27a 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -8,7 +8,7 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     sign-artifacts: true
     project: 'ccsdk/sli/northbound'
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
+      - 'elalto':
+          branch: 'elalto'
     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
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 329a17f..e08c8d0 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -9,7 +9,7 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/sli/plugins'
     stream:
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
+      - 'elalto':
+          branch: 'elalto'
     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
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index ca72bea..03350a8 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -9,7 +9,7 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/utils'
     stream:
diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml
index 3c25793..63b6e80 100644
--- a/jjb/clamp/clamp-csit.yaml
+++ b/jjb/clamp/clamp-csit.yaml
@@ -8,8 +8,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'dublin':
-              branch: 'dublin'
     functionality:
       - 'APIs':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index fa169ef..418f0f2 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -25,7 +25,7 @@
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'clamp'
     stream:
diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml
index 48d1151..7438b86 100644
--- a/jjb/cli/cli-csit.yaml
+++ b/jjb/cli/cli-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'cli'
+    disabled: true
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index bbccbc2..2a4ef29 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -19,7 +19,7 @@
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean install'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           mvn-goals: 'clean deploy docker:build -DpushImage'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index 230df5e..1ba7b15 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -21,7 +21,7 @@
           mvn-params: '-DskipTests=true'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 35ac5ee..ad771b7 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'el-alto':
-          branch: 'el-alto'
+      - 'elalto':
+          branch: 'elalto'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -22,7 +22,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 716f29f..e2d6300 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'
+      - 'elalto':
+          branch: 'elalto'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
@@ -20,7 +22,7 @@
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 2f80211..189de7a 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -15,7 +15,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/collectors/restconf'
     stream:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 76efa4f..4f51f2b 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -15,7 +15,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/collectors/ves'
     stream:
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index d8f4460..cb0f944 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'el-alto':
-          branch: 'el-alto'
+      - 'elalto':
+          branch: 'elalto'
     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-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
index f378ea0..38bb84e 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index dd788fa..7b89b1a 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -26,8 +26,8 @@
     stream:
       - master:
           branch: master
-      - el-alto:
-          branch: el-alto
+      - elalto:
+          branch: elalto
 
 - project:
     name: dcaegen2-platform-configbinding-sonar
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 77c4efc..3851bb6 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,8 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'el-alto':
-          branch: 'el-alto'
+      - 'elalto':
+          branch: 'elalto'
     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 45502a8..9b3a387 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'el-alto':
-          branch: 'el-alto'
+      - 'elalto':
+          branch: 'elalto'
     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-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 3472d79..2f0ec21 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'el-alto':
-          branch: 'el-alto'
+      - 'elalto':
+          branch: 'elalto'
 
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
     # due to a strange macro / variable translation problem this needs
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 4fa3ff5..d2774a1 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -15,12 +15,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/mapper'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     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 83f047c..dc6eac1 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'el-alto':
-          branch: 'el-alto'
+      - 'elalto':
+          branch: 'elalto'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -26,7 +26,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 294623e..cb9130f 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -9,18 +9,19 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImage'
+          mvn-goals: 'clean package docker:build docker:push'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/services/prh'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index d0b00c0..0f8dc19 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -15,12 +15,14 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/son-handler'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
index 1ba6d5d..85593ba 100644
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dmaap-buscontroller'
     stream: 'master'
+    disabled: true
     functionality:
       - 'ssl':
           trigger_jobs:
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index dd4a4e4..aa58fee 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -14,7 +14,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/datarouter'
     stream:
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 0f5da07..6e297e8 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/messagerouter/mirroragent'
     stream:
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 3ef84fa..8eff9f6 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/messagerouter/msgrtr'
     stream:
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index b758ba5..66bb307 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -23,7 +23,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'externalapi/nbi'
     stream:
       - 'master':
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 38a06ce..0df1293 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -101,35 +101,3 @@
           settings-file: '{mvn-settings}'
       - docker-login
       - shell: '{script}'
-
-- job-template:
-    #
-    # job template for build project executed every 6hrs
-    #
-    # Required Variables:
-    #   script:         build script to execute
-    name: '{name}-{stream}-shell-6hrs'
-    node: '{build-node}'
-    type: freestyle
-
-    parameters:
-      - lf-infra-parameters:
-          branch: '{branch}'
-          project: '{project}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          submodule-recursive: '{submodule-recursive}'
-          choosing-strategy: 'gerrit'
-
-    triggers:
-      - timed: '00 */6 * * *'
-
-    builders:
-      - shell: '{script}'
-
-    publishers:
-      - lf-infra-publish
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 1c8242f..eecedd4 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -771,4 +771,137 @@
             - '{parent_job}'
           result: 'success'
 
+- job-template:
+    # Job template for creating a docker manifest list
+    #
+    # The purpose of this job template is to run:
+    # 1. docker_push_manifest.sh script (which needs to exist in the
+    #    project implementation repo)
 
+    name: '{project-name}-docker-manifest-{stream}'
+    <<: *docker_job_boiler_plate
+    node: '{build-node}'
+    build-timeout: 15
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - string:
+          name: PARENT_JOB_NAME
+          default: 'none'
+
+    disabled: '{obj:disabled}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '$GIT_URL/$PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: true
+          submodule-disable: '{submodule-disable}'
+          submodule-timeout: '{submodule-timeout}'
+          choosing-strategy: default
+
+
+    builders:
+      - lf-infra-docker-login:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - shell: |
+          #!/bin/bash -ex
+          export PARENT_JOB_NAME
+          ./docker_push_manifest.sh
+
+- job-template:
+    # Job template for staging jobs on multiple architectures
+    #
+    # The purpose of this job template is to:
+    # 1. Run parallel maven-docker-stage jobs for each supported architecure
+    # 2. Build and push a docker manifest list for the images created by
+    #    the previous jobs
+
+    name: '{project-name}-multiarch-docker-stage-{stream}'
+    node: '{build-node}'
+    project-type: multijob
+    disabled: '{obj:disabled}'
+    build-timeout: 15
+    pattern: '**'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'none'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'registry-1.docker.io'
+
+    disabled: '{obj:disabled}'
+
+    properties:
+      - throttle:
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '{project-name}-.*-docker-.*'
+          blocking-level: 'NODE'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '$GIT_URL/$PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: true
+          submodule-timeout: 10
+          submodule-disable: false
+          choosing-strategy: default
+
+    triggers:
+      - timed: '@daily'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+             - comment-added-contains-event:
+                 comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
+
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                 - compare-type: ANT
+                   pattern: "**"
+
+    builders:
+      - multijob:
+          name: 'build docker images'
+          condition: ALWAYS
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-amd64-maven-docker-stage-{stream}'
+              kill-phase-on: FAILURE
+              current-parameters: true
+            - name: '{project-name}-arm64-maven-docker-stage-{stream}'
+              kill-phase-on: NEVER
+              current-parameters: true
+      - multijob:
+          name: 'publish docker manifest'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-docker-manifest-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                PARENT_JOB_NAME=$JOB_NAME
+                DOCKERHUB_REGISTRY=docker.io
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c589fba..bfc9c25 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -616,6 +616,12 @@
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*(amd64|arm64).*
+          label: '{project-name}'
+          steps:
+            - shell: !include-raw-escape: global-jjb/shell/docker-login.sh
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{obj:pom}'
@@ -1369,3 +1375,79 @@
           # use default as mvn-profile if profile is not needed
           mvn-profile: '{mvn-profile}'
           mvn-params: ''
+
+- job-template:
+    # Job template for Java merge jobs on multiple architectures
+    #
+    # The purpose of this job template is to:
+    # 1. Run parallel {project-name}-{stream}-verify-java jobs for each supported architecture
+    # 2. Build and push a docker manifest list for the images created by
+    #    the previous jobs
+
+    name: '{project-name}-multiarch-{stream}-merge-java'
+    node: '{build-node}'
+    project-type: multijob
+    disabled: '{obj:disabled}'
+    pattern: '**'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'none'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'registry-1.docker.io'
+
+    properties:
+      - throttle:
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '{project-name}-.*-merge-.*'
+          blocking-level: 'NODE'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - multijob:
+          name: 'build docker images'
+          condition: ALWAYS
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-amd64-{stream}-merge-java'
+              kill-phase-on: FAILURE
+              current-parameters: true
+            - name: '{project-name}-arm64-{stream}-merge-java'
+              kill-phase-on: NEVER
+              current-parameters: true
+      - multijob:
+          name: 'publish docker manifest'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-docker-manifest-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                PARENT_JOB_NAME=$JOB_NAME
+                DOCKERHUB_REGISTRY=docker.io
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index fcbf745..e6f0744 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -2,6 +2,52 @@
 # vim: sw=2 ts=2 sts=2 et :
 
 - job-template:
+    #
+    # job template for verifying gerrit changeset by shell script
+    #
+    # Required Variables:
+    #   project-name:   name of project
+    #   area:           area of project covered with this verification job
+    #   project:        name of scm repository to work on
+    #   stream:         name of stream used (set the same as branch if you're not sure)
+    #   branch:         git branch to work on
+    #   script:         build script to execute
+    # Optional Variables:
+    #   pattern:          trigger job only if modification covered file in pattern
+    #   build-node:     label(flavor) of jenkins slave
+    name: '{project-name}-{stream}-{area}-verify-shell'
+    node: '{build-node}'
+    type: freestyle
+
+    pattern: '**'
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: '{project}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          submodule-recursive: '{submodule-recursive}'
+          choosing-strategy: 'gerrit'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - shell: '{script}'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
     # Job template for merging a submission.  triggered on
     # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then
     # run script
diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml
index 9d2323a..bf7e768 100644
--- a/jjb/holmes/holmes-csit.yaml
+++ b/jjb/holmes/holmes-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'holmes-rule-management'
     stream: 'master'
+    disabled: true
     functionality:
       - 'sanity-check':
           trigger_jobs: 'holmes-rule-management-master-docker-java-daily'
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 beb1f63..4069552 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
@@ -16,7 +16,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-aai-context-builder
     stream:
       - 'master':
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 0677cb0..f8d94e7 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-audit-common
     stream:
       - 'master':
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 6fdd623..938d5f9 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -16,7 +16,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-context-aggregator
     stream:
       - 'master':
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 1c5a6dc..8c077fa 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
@@ -16,7 +16,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     stream:
       - 'master':
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 f886043..21491c3 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
@@ -16,7 +16,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-sdc-context-builder
     stream:
       - 'master':
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 f9147b5..3765a33 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
@@ -16,7 +16,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
     stream:
       - 'master':
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index aa8c246..bead4e5 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'logging-analytics'
     stream:
       - 'master':
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index bdb16ab..42a6657 100644
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'msb'
     stream: 'master'
+    disabled: true
     functionality:
       - 'sanity-check':
           trigger_jobs:
diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
index 1094631..3deb163 100644
--- a/jjb/multicloud/multicloud-azure-csit.yaml
+++ b/jjb/multicloud/multicloud-azure-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-azure'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 6fd0ccf..388f94c 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -31,7 +31,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml
index a5a1540..8407230 100644
--- a/jjb/multicloud/multicloud-k8s-csit.yaml
+++ b/jjb/multicloud/multicloud-k8s-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-k8s'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily'
diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml
deleted file mode 100644
index d533464..0000000
--- a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
-    name: multicloud-k8s-kud-deployment
-    project: 'multicloud/k8s'
-    build-node: ubuntu1604-builder-4c-4g
-    kud_build_script: !include-raw-escape: kud-deployment.sh
-
-    stream:
-      - 'master':
-          branch: 'master'
-
-    jobs:
-      - '{name}-{stream}-shell-6hrs':
-          script: '{kud_build_script}'
-
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 4d368af..914c2bd 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -11,6 +11,11 @@
       - '{project-name}-{stream}-docker-golang-shell-daily':
           script:
             !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+      - '{project-name}-{stream}-{area}-verify-shell':
+          area: kud-deployment
+          script:
+            !include-raw-escape: 'kud-deployment.sh'
+          build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/k8s'
     subproject:
       - validation-scripts:
diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
index 2e36856..180114a 100644
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-pike'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs:
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index bf813c5..c297872 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -28,7 +28,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
@@ -75,6 +75,7 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack/vmware
     project-name: 'multicloud-openstack-vmware'
+    build-node: 'ubuntu1604-builder-4c-4g'
     branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
 
diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
index fa8dfd4..c246276 100644
--- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-windriver'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index f871324..42d2672 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -66,7 +66,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml
index a0dbc81..c0299f6 100644
--- a/jjb/music/music-csit.yaml
+++ b/jjb/music/music-csit.yaml
@@ -5,11 +5,10 @@
        - '{project-name}-{stream}-verify-csit-{functionality}'
        - '{project-name}-{stream}-csit-{functionality}'
      project-name: 'music'
+     disabled: true
      stream: 'master'
      functionality:
        - 'music-test-plan':
            trigger_jobs: 'music-master-docker-version-java-daily'
      robot-options: ''
      branch: 'master'
-
-
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index abf404f..5bbaae3 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -22,7 +22,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'music'
     stream:
       - 'master':
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index f13cbb3..b4d3ca7 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'oparent'
     stream:
diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml
index ae0a790..4bf5165 100644
--- a/jjb/optf/optf-cmso-csit.yaml
+++ b/jjb/optf/optf-cmso-csit.yaml
@@ -8,8 +8,6 @@
      stream:
        - 'master':
            branch: master
-       - 'dublin':
-           branch: dublin
      functionality:
        - 'cmso':
            trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 2c2b24d..bc22c15 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -24,7 +24,8 @@
          mvn-params: '-Dmaven.test.skip=true'
          maven-properties: |
           cmso.registry=$
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     build-node: ubuntu1604-docker-8c-8g
     project: 'optf/cmso'
     stream:
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 4988786..57bc512 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -5,6 +5,7 @@
        - '{project-name}-{stream}-verify-csit-{functionality}'
        - '{project-name}-{stream}-csit-{functionality}'
      project-name: 'optf-has'
+     disabled: true
      stream:
        - 'master':
            branch: master
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 831988d..8fc49df 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index bb31f31..4261867 100644
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -5,11 +5,10 @@
        - '{project-name}-{stream}-verify-csit-{functionality}'
        - '{project-name}-{stream}-csit-{functionality}'
      project-name: 'optf-osdf'
+     disabled: true
      stream:
        - 'master':
            branch: master
-       - 'dublin':
-           branch: dublin
      functionality:
        - 'osdf':
            trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index a5f5e41..b5b4dc5 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -23,7 +23,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     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 fc22150..6823ed9 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -25,12 +25,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/apex-pdp'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-apex-pdp-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 048d95e..ea20cea 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/api'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-api-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2b7d045..d908b07 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/common'
     stream:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 4c2c03e..7209baf 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/distribution'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-distribution-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 4551f15..4113bfd 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-docker-base-common
+    name: policy-docker-base-common-elalto
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -16,14 +16,69 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/docker'
+    stream:
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'policy-docker-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: policy-docker-base-common
+    project-name: 'policy-docker'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          project-name: 'policy-docker-amd64'
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          build-node: ubuntu1604-docker-8c-8g
+          pattern: 'do_not_match_any_file'
+      - '{project-name}-{stream}-merge-java':
+          project-name: 'policy-docker-arm64'
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          build-node: ubuntu1604-docker-arm64-4c-2g
+          pattern: 'do_not_match_any_file'
+      - '{project-name}-multiarch-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          project-name: 'policy-docker-arm64'
+          build-node: ubuntu1604-docker-arm64-4c-2g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          container-public-registry: 'docker.io'
+          container-staging-registry: 'docker.io'
+          cron: ''
+          gerrit_trigger_file_paths:
+             - compare-type: REG_EXP
+               pattern: 'do_not_match_any_file'
+      - gerrit-maven-docker-stage:
+          project-name: 'policy-docker-amd64'
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          container-public-registry: 'docker.io'
+          container-staging-registry: 'docker.io'
+          cron: ''
+          gerrit_trigger_file_paths:
+             - compare-type: REG_EXP
+               pattern: 'do_not_match_any_file'
+      - '{project-name}-docker-manifest-{stream}':
+          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-multiarch-docker-stage-{stream}'
+#      - '{project-name}-gerrit-release-jobs':
+#          build-node: centos7-docker-8c-8g
 
     project: 'policy/docker'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index a6dd4d8..47f27ff 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/drools-applications'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-drools-applications-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 1826044..b1ddf34 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/drools-pdp'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-drools-pdp-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 32651a7..bbdcbcf 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/engine'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-engine-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index d2a7da0..f60572a 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -10,12 +10,14 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/models'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-models-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index a9ab05f..65ff979 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/pap'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-pap-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 2f82d77..ef6891c 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/parent'
     stream:
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index a307904..11d2f49 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -19,12 +19,14 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/xacml-pdp'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-xacml-pdp-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 152c303..f15dfc0 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -18,6 +18,8 @@
           pattern: 'ecomp-sdk/**'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'portal/sdk'
     stream:
       - 'master':
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 4088aeb..806b1cc 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'sdc/jtosca'
     stream:
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 3ad86fc..c7a3424 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'sdc/sdc-distribution-client'
     stream:
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 78c8986..98725b8 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'sdc/sdc-tosca'
     stream:
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 7a2c2a7..edb5b90 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -21,12 +21,14 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 8363700..d7d816d 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -9,12 +9,14 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'sdnc/northbound'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 73b58dd..d748105 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -18,11 +18,13 @@
           maven-version: "mvn35"
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
       - 'elalto-fluorine':
           branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 09e9c22..977d397 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'so/libs'
     stream:
       - 'master':
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 6ff962e..21e9c64 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -22,7 +22,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'so'
     stream:
       - 'master':
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
index 20ba913..47c727c 100644
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -15,6 +15,8 @@
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     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 7bca18f..f9b756b 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -2,7 +2,7 @@
 - project:
     name: testsuite-python-testing-utils
     project-name: 'testsuite-python-testing-utils'
-    python-version: python2
+    python-version: python3
     jobs:
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
@@ -10,16 +10,18 @@
     subproject:
       - 'robotframework-onap':
           tox-dir: './robotframework-onap/'
-          tox-envs: 'py27'
+          tox-envs: 'py3'
     stream:
       - 'master':
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-python-testing-utils-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'centos7-builder-4c-4g'
 
 - project:
     name: testsuite-python-testing-utils-verify
@@ -30,8 +32,10 @@
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-python-testing-utils-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'centos7-builder-4c-4g'
     subproject:
       - 'robotframework-onap':
           path: 'robotframework-onap'
@@ -40,19 +44,6 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
 
 - 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:
     name: testsuite-python-testing-utils-info
     project-name: testsuite-python-testing-utils
     jobs:
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 0b1e6cb..0bde8c1 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -35,6 +35,8 @@
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-settings'
 
 - project:
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 0030c0f..1442e89 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -31,7 +31,7 @@
             !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index f9d8f72..799a18e 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -25,7 +25,7 @@
             !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index fe6587c..fdb61ec 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -26,7 +26,7 @@
             !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index ef69fbc..317f8ad 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -27,7 +27,7 @@
             !include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 034177e..b6ba9e9 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -22,7 +22,7 @@
             !include-raw-escape: 'build-nfvo-db-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
 
 - project:
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 4a47a2a..6b836dd 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -28,7 +28,7 @@
             !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 349b532..0b121e1 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -21,7 +21,7 @@
           mvn-pom: 'zte/vmanager/pom.xml'
           mvn-params: '-f zte/vmanager/pom.xml'
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 2fe8845..0feca60 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -21,7 +21,7 @@
             !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 8f6d878..5cfce34 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -25,8 +25,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
index 93cbf9f..a0679bb 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vnfsdk-pkgtools'
+    disabled: true
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
index e34fd74..9ff4e85 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vnfsdk-refrepo'
     stream: 'master'
+    disabled: true
     functionality:
       - 'sanity-check':
           trigger_jobs: '{project-name}-{stream}-merge-java'