diff --git a/global-jjb b/global-jjb
index 1a5a638..09659ce 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 1a5a6387044fbca79d9bad4d4037e086637f7b30
+Subproject commit 09659ce65d005b15595a44bbef6304fd3cc83ac1
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 4ea16cc..f3f6e4c 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v3-standard-2
 VOLUME_SIZE=20
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 27f0cbe..469f189 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 5695a77..7676454 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -5,7 +5,7 @@
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
 VOLUME_SIZE=20
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf
@@ -14,7 +14,6 @@
 SANDBOX_CAP=4
 FLOATING_IP_POOL=
 SECURITY_GROUPS=default
-AVAILABILITY_ZONE=ca-ymq-2
 STARTUP_TIMEOUT=600000
 KEY_PAIR_NAME=jenkins
 NUM_EXECUTORS=1
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index efb5787..ff70b9d 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210622-014943.553
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=20
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
deleted file mode 100644
index ca9d19d..0000000
--- a/jjb/aai/aai-cacher.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- project:
-    name: aai-cacher-master
-    project-name: 'aai-cacher'
-    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
-      - gerrit-maven-docker-stage:
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/cacher'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    mvn-settings: 'aai-cacher-settings'
-    mvn-version: 'mvn35'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: aai-cacher-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/cacher'
-    project-name: 'aai-cacher'
-    branch: 'master'
-    mvn-settings: 'aai-cacher-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
-
-- project:
-    name: aai-cacher-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/cacher'
-    project-name: 'aai-cacher'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-cacher-settings'
-    mvn-version: 'mvn35'
-
-
-- project:
-    name: aai-cacher-info
-    project-name: aai-cacher
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/cacher
-    branch: master
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index a8f0892..b32f224 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -32,10 +32,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
@@ -80,10 +80,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 911e144..c8af14c 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'ccsdk-distribution-settings'
     robot-options: ''
     branch: 'master'
@@ -35,10 +37,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'ccsdk-oran-settings'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 0702230..3193bfe 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -27,10 +27,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
@@ -52,10 +52,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index dcfa218..acece7c 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -26,10 +26,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
@@ -113,8 +113,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index fb996f4..3125424 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -28,10 +28,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
@@ -71,10 +71,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 9b6544f..00a2af4 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -20,10 +20,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
@@ -69,10 +69,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 80f4cf2..7e5685b 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -22,10 +22,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
@@ -47,8 +47,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 77cf7be..864aa75 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -20,10 +20,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'
@@ -68,10 +68,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
deleted file mode 100644
index 2506198..0000000
--- a/jjb/ccsdk/utils.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- project:
-    name: ccsdk-utils
-    project-name: 'ccsdk-utils'
-    jobs:
-      - gerrit-maven-verify:
-          cron: ''
-      - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'ccsdk/utils'
-    stream:
-      - 'master':
-          branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    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
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-utils-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/utils'
-    project-name: 'ccsdk-utils'
-    stream:
-      - 'master':
-          branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-utils-settings'
-
-- project:
-    name: ccsdk-utils-info
-    project-name: ccsdk-utils
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/utils
-    branch: master
-
-- project:
-    name: ccsdk-utils-whitesource
-    project-name: ccsdk-utils
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-utils-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/utils
-    branch: master
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index d05996f..60d74c9 100644
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -16,6 +16,7 @@
     platforms:
       - centos-7
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: builder
     update-cloud-image: true
 
@@ -37,6 +38,8 @@
       - centos-7
       - ubuntu-18.04-arm64
       - ubuntu-18.04
+      - ubuntu-20.04
+      - ubuntu-20.04-arm64
     templates: docker
     update-cloud-image: true
 
@@ -56,6 +59,7 @@
 
     platforms:
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: memcached
     update-cloud-image: true
 
@@ -92,5 +96,6 @@
 
     platforms:
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: helm
     update-cloud-image: true
diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
new file mode 100644
index 0000000..1d6669b
--- /dev/null
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+      name: cps-cps-temporal-csit
+      jobs:
+          - '{project-name}-review-verification-maven-{stream}':
+                mvn-goals: clean install
+                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
+          - '{project-name}-merge-verification-maven-{stream}':
+                mvn-goals: clean install
+                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
+      project-name: 'cps-cps-temporal'
+      recipients: 'toine.siebelink@est.tech'
+      # project name in gerrit
+      project: 'cps/cps-temporal'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'honolulu':
+                branch: 'honolulu'
+      mvn-settings: 'cps-cps-temporal-settings'
+      robot-options: ''
+      branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 4fbd716..e5ae144 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -23,8 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index d0ef104..4374d47 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index db6d27d..0b3c6cb 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     # apply to all jobs
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 141d09b..955997b 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -22,8 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index a29412d..06c1505 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 8db729a..bfd9e25 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          sign-artifacts: false
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
@@ -22,12 +22,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'ves_synchronous':
-          branch: 'ves_synchronous'
     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 200cf55..1421ef0 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -12,8 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     mvn-settings: 'dcaegen2-deployments-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 70c49f4..a36be28 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -12,8 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index a0e3d32..ff838dd 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -30,8 +30,8 @@
     stream:
       - master:
           branch: master
-      - guilin:
-          branch: guilin
+      - istanbul:
+          branch: istanbul
       - honolulu:
           branch: honolulu
 
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
deleted file mode 100644
index 4187a9b..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-deployment-handler
-    project-name: 'dcaegen2-platform-deployment-handler'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dcaegen2/platform/deployment-handler'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    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
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-deployment-handler-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/deployment-handler
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-deployment-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
-
-- project:
-    name: dcaegen2-platform-deployment-handler-info
-    project-name: dcaegen2-platform-deployment-handler
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/deployment-handler
-    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index fbf33b4..369e6f4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -95,8 +95,8 @@
     stream:
       - master:
           branch: master
-      - guilin:
-          branch: guilin
+      - istanbul:
+          branch: istanbul
       - honolulu:
           branch: honolulu
 
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
deleted file mode 100644
index 698a5cd..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-inventory-api
-    project-name: 'dcaegen2-platform-inventory-api'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImage'
-
-    project: 'dcaegen2/platform/inventory-api'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    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
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-inventory-api-sonar
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform/inventory-api'
-    project-name: 'dcaegen2-platform-inventory-api'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-inventory-api-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-inventory-api-clm
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/inventory-api
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-inventory-api'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-inventory-api-settings'
-
-- project:
-    name: dcaegen2-platform-inventory-api-info
-    project-name: dcaegen2-platform-inventory-api
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/inventory-api
-    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index b3f2a2f..e50fc88 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -22,8 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 59eaa94..255817d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -15,8 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     mvn-settings: dcaegen2-platform-settings
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index f2858c7..3aeca04 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -15,10 +15,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index db490f7..08b17c2 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -15,10 +15,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
index fe6aa15..66378f8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
@@ -16,9 +16,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
-          java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     maven-version: 'mvn35'
     maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
index c9b4b85..219a4d9 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
@@ -16,9 +16,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
-          java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     maven-version: 'mvn35'
     maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
index 37dfd4d..274d7e5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
@@ -16,9 +16,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
-          java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     maven-version: 'mvn35'
     maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
new file mode 100644
index 0000000..14c0198
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
@@ -0,0 +1,58 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-helm-generator
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - helm-generator:
+          pom: 'mod2/helm-generator/pom.xml'
+          pattern: 'mod2/helm-generator/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    maven-version: 'mvn35'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-helm-generator-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod2-helm-generator'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/helm-generator/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-helm-generator-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-helm-generator-clm
+    mvn-params: '-f mod2/helm-generator/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
index fd80f8b..3d8ea65 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
@@ -16,9 +16,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
-          java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     maven-version: 'mvn35'
     maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 50f3ffc..74dc768 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -12,11 +12,12 @@
       - 'master':
           branch: 'master'
           python-version: python3
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
           python-version: python3
+      - 'istanbul':
+          branch: 'istanbul'
+          python-version: python3
     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
deleted file mode 100644
index bffea62..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-policy-handler
-    project-name: 'dcaegen2-platform-policy-handler'
-    project: 'dcaegen2/platform/policy-handler'
-    python-version: python3
-    tox-dir: '.'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    build-node: ubuntu1804-docker-8c-8g
-    build-timeout: 45
-    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
-    jobs:
-      - '{project-name}-python-jobs'
-      - gerrit-docker-verify
-      - gerrit-docker-merge:
-          post_docker_build_script: |
-              #!/bin/bash
-              set -uex -o pipefail
-              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
-              DNAME={container-snapshot-registry}/{docker-name}
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
-              docker push $DNAME:$DOCKER_IMAGE_TAG2
-              docker push $DNAME:latest
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    archive-artifacts: ''
-    nexus-iq-namespace: 'onap-'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '.*'
-    container-tag-method: latest
-    docker-root: '.'
-    docker-name: onap/org.onap.dcaegen2.platform.policy-handler
-    docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
-
-
-
-- project:
-    name: dcaegen2-platform-policy-handler-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform/policy-handler'
-    project-name: 'dcaegen2-platform-policy-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-policy-handler-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/policy-handler
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-policy-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
-
-- project:
-    name: dcaegen2-platform-policy-handler-info
-    project-name: dcaegen2-platform-policy-handler
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/policy-handler
-    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
deleted file mode 100644
index 1cbe59e..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-servicechange-handler
-    project-name: 'dcaegen2-platform-servicechange-handler'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImage'
-
-    project: 'dcaegen2/platform/servicechange-handler'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-servicechange-handler-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    java-version: openjdk11
-    project: dcaegen2/platform/servicechange-handler
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-servicechange-handler'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
-
-- project:
-    name: dcaegen2-platform-servicechange-handler-info
-    project-name: dcaegen2-platform-servicechange-handler
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/servicechange-handler
-    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 77a9468..cb614e5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -24,6 +24,8 @@
               branch: 'master'
           - 'honolulu':
               branch: 'honolulu'
+          - 'istanbul':
+              branch: 'istanbul'
       mvn-settings: 'dcaegen2-platform-ves-openapi-manager-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-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index b336f35..92b0b47 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -14,10 +14,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-version: 'mvn35'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index a9efd72..837e17d 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -13,8 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
@@ -48,8 +48,8 @@
     stream:
       - 'master':
          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
@@ -82,8 +82,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
@@ -116,8 +116,8 @@
     stream:
       - 'master':
          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 97e7768..57f797b 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -106,6 +106,8 @@
           branch: master
       - honolulu:
           branch: honolulu
+      - istanbul:
+          branch: istanbul
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 83511be..82ee025 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -13,10 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     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-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index d42b2cf..635ebcc 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -15,6 +15,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index f10064d..f62e3f0 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -22,10 +22,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     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 383f9e8..586ee99 100755
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,10 +6,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 9ab8eac..88824ad 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -20,10 +20,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 0c686ef..6d16986 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -16,10 +16,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 71374e2..aa3066b 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -13,10 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index a13da55..8fe300e 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -21,10 +21,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 73289f8..624f74d 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,10 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     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.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 6cc6bf7..cf65da2 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,12 +17,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 3136272..225be16 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -39,10 +39,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/buscontroller'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index b79f2ed..1a8f5ff 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -36,10 +36,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/datarouter'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
@@ -49,17 +49,19 @@
 - project:
     name: dmaap-datarouter-csit-ssl
     jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+            mvn-goals: clean package
+            mvn-params: '-P docker docker:build -DskipTests=false'
+      - '{project-name}-merge-verification-maven-{stream}':
+            mvn-goals: clean package
+            mvn-params: '-P docker docker:build'
     project-name: 'dmaap-datarouter'
     recipients: 'fiachra.corcoran@est.tech'
+    project: 'dmaap/datarouter'
     stream:
       - 'master':
-          branch: 'master'
-    functionality:
-      - 'ssl-dr-suite':
-          trigger_jobs:
-            - '{project-name}-maven-docker-stage-{stream}'
+            branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
     robot-options: ''
 
 - project:
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 3e7ba92..8e0dbf6 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -32,10 +32,10 @@
           maven-versions-plugin: true
     project: 'dmaap/messagerouter/dmaapclient'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
index 42c312b..ff785c5 100644
--- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
@@ -20,6 +20,7 @@
     mvn-settings: 'dmaap-kafka11aaf-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk11
 
 - project:
     name: dmaap-kafka-maintenance
@@ -35,10 +36,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/kafka11aaf'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-kafka11aaf-settings'
     files: '**'
     archive-artifacts: ''
@@ -61,6 +62,7 @@
     mvn-settings: 'dmaap-kafka11aaf-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-kafka-info
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 9ad2d2e..9fb9ed2 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -38,10 +38,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/messagerouter/messageservice'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     files: '**'
     archive-artifacts: ''
@@ -52,17 +52,19 @@
 - project:
     name: dmaap-csit
     jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-    project-name: 'dmaap'
+      - '{project-name}-review-verification-maven-{stream}':
+            mvn-goals: clean deploy
+            mvn-params: '-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true'
+      - '{project-name}-merge-verification-maven-{stream}':
+            mvn-goals: clean deploy
+            mvn-params: '-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true'
+    project-name: 'dmaap-messagerouter-messageservice'
+    project: 'dmaap/messagerouter/messageservice'
     recipients: 'fiachra.corcoran@est.tech'
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'mrpubsub':
-          trigger_jobs:
-            - '{project-name}-maven-docker-stage-{stream}'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     robot-options: ''
 
 - project:
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 1d476f9..0bb247b 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -1,5 +1,6 @@
 ---
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent
     project-name: 'dmaap-messagerouter-mirroragent'
     jobs:
@@ -20,6 +21,7 @@
     archive-artifacts: ''
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-maintenance
     project-name: 'dmaap-messagerouter-mirroragent-maintenance'
     jobs:
@@ -41,6 +43,7 @@
     cron: ''
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-sonar
     jobs:
       - gerrit-maven-sonar
@@ -59,6 +62,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-clm
     jobs:
       - gerrit-maven-clm
@@ -69,6 +73,7 @@
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-info
     project-name: dmaap-messagerouter-mirroragent
     jobs:
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
deleted file mode 100644
index 69dee31..0000000
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-- project:
-    name: dmaap-messagerouter-msgrtr-java-11
-    project-name: 'dmaap-messagerouter-msgrtr-java-11'
-    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}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dmaap/messagerouter/msgrtr'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: dmaap-messagerouter-msgrtr
-    project-name: 'dmaap-messagerouter-msgrtr'
-    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: 'dmaap/messagerouter/msgrtr'
-    stream:
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
-    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
-    files: '**'
-    archive-artifacts: ''
-    cron: ''
-
-- project:
-    name: dmaap-messagerouter-msgrtr-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/messagerouter/msgrtr'
-    project-name: 'dmaap-messagerouter-msgrtr'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    java-version: openjdk11
-
-- project:
-    name: dmaap-messagerouter-msgrtr-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dmaap/messagerouter/msgrtr
-    project-name: 'dmaap-messagerouter-msgrtr'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
-    java-version: openjdk11
-
-- project:
-    name: dmaap-messagerouter-msgrtr-info
-    project-name: dmaap-messagerouter-msgrtr
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dmaap/messagerouter/msgrtr
-    branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index 3258275..8186cc3 100644
--- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
@@ -34,10 +34,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/zookeeper'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-zookeeper-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 25e3921..0e5986a 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -1,4 +1,15 @@
 ---
+############
+# BUILDERS #
+############
+
+- builder:
+    name: oom-create-netrc
+    builders:
+      - inject:
+          properties-content: "SERVER_ID={server-id}"
+      - shell: !include-raw-escape: ../shell/oom-create-netrc.sh
+
 ###########
 # ANCHORS #
 ###########
@@ -107,7 +118,7 @@
           echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
-      - lf-infra-create-netrc:
+      - oom-create-netrc:
           server-id: oom-helm
       - inject:
           properties-content: |
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 20735ae..3dbe82d 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -19,6 +19,8 @@
     node: '{build-node}'
     type: freestyle
     concurrent: true
+    disable-job: false
+    disabled: '{disable-job}'
 
     pattern: '**'
 
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 66c8b70..df48a4c 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,22 +31,6 @@
           default: '{html-files}'
           description: 'File name to be used by HTML publisher plugin to produce the report'
 
-- parameter:
-    name: integration-terraform-version
-    parameters:
-      - string:
-          name: TERRAFORM_VERSION
-          default: '{terraform-version}'
-          description: 'Terraform version to install on minion'
-
-- parameter:
-    name: integration-terragrunt-version
-    parameters:
-      - string:
-          name: TERRAGRUNT_VERSION
-          default: '{terragrunt-version}'
-          description: 'Terragrunt version to install on minion'
-
 - builder:
     name: integration-install-robotframework
     builders:
@@ -90,30 +74,6 @@
           mkdir -p ~/.ssh
 
 - builder:
-   name: integration-install-terraform
-   builders:
-     - shell: |
-         #!/bin/bash
-         set -ex
-         cd /tmp
-         wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-         unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-         sudo mv terraform /usr/local/bin/
-         terraform version
-
-- builder:
-   name: integration-install-terragrunt
-   builders:
-     - shell: |
-         #!/bin/bash
-         set -ex
-         cd /tmp
-         wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64
-         sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt
-         sudo chmod +x /usr/local/bin/terragrunt
-         terragrunt --version
-
-- builder:
     name: integration-docker-compose-logs
     builders:
       - shell: !include-raw: shell/docker-compose-logs.sh
diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
deleted file mode 100644
index 0089454..0000000
--- a/jjb/integration/integration-terraform.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-- project:
-    name: integration-terraform-info
-    project: integration/terraform
-    project-name: integration-terraform
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- project:
-    name: integration-terraform-linters
-    project: integration/terraform
-    project-name: integration-terraform
-    python-version: python3
-    jobs:
-      - integration-linters
-    subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
-    stream:
-      - 'master':
-          branch: 'master'
-
-- project:
-    name: integration-terraform-validate
-    project: integration/terraform
-    project-name: integration-terraform
-    jobs:
-      - integration-terraform-verify
-    subproject:
-      - 'openlab':
-          tox-dir: 'openlab'
-          tox-envs: 'terraform'
-          pattern: 'openlab/**'
-    stream:
-      - 'master':
-          branch: 'master'
diff --git a/jjb/integration/integration-terragrunt.yaml b/jjb/integration/integration-terragrunt.yaml
deleted file mode 100644
index 04391fb..0000000
--- a/jjb/integration/integration-terragrunt.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- project:
-    name: integration-terragrunt-project-view
-    project-name: integration-terragrunt
-    views:
-      - project-view
-
-- project:
-    name: integration-terragrunt-info
-    project: integration/terragrunt
-    project-name: integration-terragrunt
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- project:
-    name: integration-terragrunt-linters
-    project: integration/terragrunt
-    project-name: integration-terragrunt
-    python-version: python3
-    jobs:
-      - integration-linters
-    subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
-    stream:
-      - 'master':
-          branch: 'master'
-
-- project:
-    name: integration-terragrunt-validate
-    project: integration/terragrunt
-    project-name: integration-terragrunt
-    jobs:
-      - integration-terraform-verify
-    subproject:
-      - 'terragrunt':
-          tox-dir: '.'
-          tox-envs: 'terragrunt'
-          pattern: '**'
-    stream:
-      - 'master':
-          branch: 'master'
diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml
deleted file mode 100644
index 5b07413..0000000
--- a/jjb/integration/simulators/integration-dc-simulator.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: integration-simulators-dc-simulator-info
-    project-name: integration-simulators-dc-simulator
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: integration/simulators/dc-simulator
-    branch: master
-
-- project:
-    name: integration-simulators-dc-simulator-linters
-    project: integration/simulators/dc-simulator
-    project-name: integration-simulators-dc-simulator
-    python-version: python3
-    jobs:
-      - integration-linters
-    subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-    stream:
-      - 'master':
-          branch: 'master'
diff --git a/jjb/integration/simulators/integration-masspnf-simulator.yaml b/jjb/integration/simulators/integration-masspnf-simulator.yaml
deleted file mode 100644
index 8121708..0000000
--- a/jjb/integration/simulators/integration-masspnf-simulator.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- project:
-    name: integration-simulators-masspnf-simulator-project-view
-    project-name: integration-simulators-masspnf-simulator
-    views:
-      - project-view
-
-- project:
-    name: integration-simulators-masspnf-simulator-info
-    project: integration/simulators/masspnf-simulator
-    project-name: integration-simulators-masspnf-simulator
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- project:
-    name: integration-simulators-masspnf-simulator-docker
-    project-name: integration-simulators-masspnf-simulator
-    jobs:
-      - integration-docker-merge
-      - integration-docker-verify
-    project: integration/simulators/masspnf-simulator
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-      - 'masspnfsim':
-          pom: 'pnf-sim-lightweight/pom.xml'
-          pattern: '**'
-          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
-          post-docker-verify-script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/
-              tox -e pytest
-    mvn-settings: 'integration-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: integration-simulators-masspnf-simulator-linters
-    project: 'integration/simulators/masspnf-simulator'
-    project-name: 'integration-simulators-masspnf-simulator'
-    python-version: python3
-    jobs:
-      - integration-linters
-    subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
-    stream:
-      - 'master':
-          branch: 'master'
diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
deleted file mode 100644
index ce2743e..0000000
--- a/jjb/integration/usecases/integration-usecases-bbs.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: integration-usecases-bbs-info
-    project-name: integration-usecases-bbs
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: integration/usecases/bbs
-    branch: master
-
-- project:
-    name: integration-usecases-bbs-linters
-    project: integration/usecases/bbs
-    project-name: integration-usecases-bbs
-    python-version: python3
-    jobs:
-      - integration-linters
-    subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-    stream:
-      - 'master':
-          branch: 'master'
diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml
deleted file mode 100644
index 475b271..0000000
--- a/jjb/integration/usecases/integration-usecases-mdons.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: integration-usecases-mdons-info
-    project-name: integration-usecases-mdons
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: integration/usecases/mdons
-    branch: master
-
-- project:
-    name: integration-usecases-mdons-linters
-    project: integration/usecases/mdons
-    project-name: integration-usecases-mdons
-    python-version: python3
-    jobs:
-      - integration-linters
-    subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-    stream:
-      - 'master':
-          branch: 'master'
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 5ac5d8d..a5674e2 100644
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -39,10 +39,6 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'frankfurt':
-                branch: 'frankfurt'
-          - 'guilin':
-                branch: 'guilin'
           - 'honolulu':
                 branch: 'honolulu'
 
@@ -108,6 +104,16 @@
           docker-root: ./security
           docker-name: 'onap/xtesting-security'
           docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+          docker-root: ./smoke-usecases-robot-py3
+          docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+          docker-root: ./smoke-usecases-robot-py3
+          docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
+          docker-build-args: '-f ./docker/Dockerfile'
     project: 'integration/xtesting'
     stream:
       - 'master':
@@ -116,9 +122,6 @@
       - 'honolulu':
             branch: 'honolulu'
             files: ''
-      - 'guilin':
-            branch: 'guilin'
-            files: ''
       - 'develop':
             branch: 'develop'
             files: ''
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 8804725..428535a 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -12,6 +12,7 @@
           script:
             !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
       - '{project-name}-{stream}-{area}-verify-shell':
+          disable-job: '{disable-kud}'
           area: kud-deployment
           build-timeout: 45
           script:
@@ -28,7 +29,10 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+          #KUD fixes are not backported to maintenance branches
+          disable-kud: true
     mvn-settings: 'multicloud-k8s-settings'
+    disable-kud: false
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 4b57060..fbdbbdd 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -18,6 +18,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 3746aed..02d6b55 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 1ca5db6..619c343 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -9,6 +9,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index f614feb..c8b3ec3 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 81bc61a..ee9eb9b 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index c27aab8..5f574c6 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
@@ -58,7 +59,7 @@
     name: policy-drools-pdp-clm
     jobs:
       - gerrit-maven-clm:
-          mvn-params: '-DskipTests'
+          mvn-params: '-Dmaven.test.skip=true'
     nexus-iq-namespace: 'onap-'
     project: policy/drools-pdp
     project-name: 'policy-drools-pdp'
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 43f0966..aba5a41 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -12,16 +12,15 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          disabled: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
-          disabled: true
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/gui'
     stream:
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index c2d5b48..afa220d 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index a7a7ce5..978fbff 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 2ec9cb0..e76ad67 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -9,6 +9,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index d8abd90..06c4398 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -12,6 +12,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index c053518..3064f2c 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -21,8 +21,8 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'honolulu':
-                branch: 'honolulu'
+          - 'istanbul':
+                branch: 'istanbul'
       java-version: openjdk11
       maven-version: 'mvn36'
       mvn-settings: 'sdc-settings'
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index f7c811c..dd25652 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -24,13 +24,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-onap-ui-angular-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-onap-ui-angular-sonar
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 28d0a78..6316059 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -18,13 +18,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-onap-ui-common-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-onap-ui-common-sonar
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index c7e66c2..fb3e788 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -21,13 +21,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-sdc-be-common-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-be-common-sonar
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index c3b9ce3..e20b954 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -23,14 +23,14 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
           java-version: openjdk11
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-distribution-client-integration-pairwise
@@ -48,7 +48,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
     mvn-params: ' -P integration-pairwise'
 
 - project:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index d83b2e5..45372c3 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -23,31 +23,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: sdc-sdc-docker-base-arm64
-#    project-name: 'sdc-sdc-docker-base-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-sdc-merge-java':
-#          build-node: 'ubuntu1804-docker-8c-8g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'default'
-#    project: 'sdc/sdc-docker-base'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-sdc-docker-base-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-docker-base-info
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 5cdb6fc..46a68cf 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -18,13 +18,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-pubsub-sonar
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index a86d3b2..5cfdc2f 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -22,13 +22,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-tosca-sonar
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index abc5966..2547e6b 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -28,34 +28,16 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
-#- project:
-#    name: sdc-sdc-workflow-designer-arm64
-#    project-name: 'sdc-sdc-workflow-designer-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'sdc/sdc-workflow-designer'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
 - project:
     name: sdc-sdc-workflow-designer-sonar
     jobs:
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bd12fb3..bba93f0 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -56,6 +56,7 @@
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+          mvn-version: 'mvn36'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -66,8 +67,8 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
           java-version: openjdk11
     mvn-settings: 'sdc-settings'
     files: '**'
@@ -95,7 +96,7 @@
     mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
-    maven-version: 'mvn36'
+    mvn-version: 'mvn36'
 
 - project:
     name: sdc-clm
@@ -109,7 +110,7 @@
     project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
-    maven-version: 'mvn36'
+    mvn-version: 'mvn36'
     mvn-settings: 'sdc-settings'
     java-version: openjdk11
 
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 43ad1c2..6c843ce 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -10,6 +10,9 @@
     project-name: 'sdnc-apps'
     jobs:
       - gerrit-maven-verify:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Ddocker.skip.push=true -Pdocker'
       - gerrit-maven-merge:
           cron: '@daily'
@@ -33,10 +36,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 0ce45c3..cc21503 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdnc-oam-settings'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 9ba264e..80c9dfd 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -17,10 +17,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 98bc0df..f4be0c6 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,10 +26,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: "mvn36"
     mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index d03fee0..7bdd671 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -11,9 +11,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
-          java-version: openjdk11
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index c7d7bb7..9846475 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -16,9 +16,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
-          java-version: openjdk11
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
@@ -72,4 +69,3 @@
     build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
-    branch: guilin
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index a8d9971..f859156 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -29,9 +29,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
-          java-version: openjdk11
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
@@ -114,6 +111,10 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: so
-    branch: master
-    branch: guilin
-    branch: honolulu
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
deleted file mode 100644
index e0f9c9f..0000000
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- project:
-    name: testsuite-heatbridge-master
-    project-name: 'testsuite-heatbridge'
-    subproject:
-      - heatbridge:
-          path: '.'
-          pattern: '**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-    project: 'testsuite/heatbridge'
-    subproject:
-      - 'heatbridge':
-          path: 'heatbridge'
-          pattern: 'heatbridge/**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'testsuite-heatbridge-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: testsuite-heatbridge-master-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: testsuite/heatbridge
-    project-name: 'testsuite-heatbridge'
-    build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'testsuite-heatbridge-settings'
-
-- project:
-    name: testsuite-heatbridge-info
-    project-name: testsuite-heatbridge
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: testsuite/heatbridge
-    branch: master
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 57e12fc..c19beea 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -20,24 +20,6 @@
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: vnfsdk-functest-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'vnfsdk/functest'
-    project-name: 'vnfsdk-functest'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-functest-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
     name: vnfsdk-functest-info
     jobs:
       - gerrit-info-yaml-verify
diff --git a/packer/common-packer b/packer/common-packer
index 3882ccb..c93ddda 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 3882ccbaf8789d13357c926b286f106d31950792
+Subproject commit c93dddaeb54c0cf1c8f8371f4431d91416292cf0
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 6ada81d..b2b0a52 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -10,6 +10,7 @@
     glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c
     glide_version: v0.13.1
     golang_version: 1.9.1
+    npm_version: "6.14.13"
 
   tasks:
     - name: "Checking for x86_64"
@@ -181,6 +182,18 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
+    - name: npm self-update
+      command: npm install npm@{{ npm_version }} -g
+      become: true
+
+    - name: npm install n module
+      command: npm install n -g
+      become: true
+
+    - name: Upgrade latest stable node version
+      command: n stable | PATH="$PATH"
+      become: true
+
     - name: Add Google Chrome key
       apt_key:
         url: https://dl-ssl.google.com/linux/linux_signing_key.pub
@@ -224,6 +237,7 @@
       git:
         repo: 'https://github.com/erlang/rebar3.git'
         dest: /tmp/rebar3
+        version: v3.13
       when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install rebar3 to bin
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 93f9161..9568c01 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -25,7 +25,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index cd6daee..6cdab9d 100644
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -24,7 +24,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index b52a8ac..6bf7b17 100644
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -24,7 +24,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh
index bfc3466..5aecc8e 100755
--- a/shell/helm-repo-init.sh
+++ b/shell/helm-repo-init.sh
@@ -6,6 +6,6 @@
 
 chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null &
 source helm.prop
-$HELM_BIN plugin install https://github.com/chartmuseum/helm-push.git || true
+$HELM_BIN plugin install --version v0.9.0 https://github.com/chartmuseum/helm-push.git || true
 $HELM_BIN repo add local http://localhost:6464
 $HELM_BIN repo add onap http://localhost:6464
diff --git a/shell/oom-create-netrc.sh b/shell/oom-create-netrc.sh
new file mode 100644
index 0000000..1b273b1
--- /dev/null
+++ b/shell/oom-create-netrc.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+echo "---> oom-create-netrc.sh"
+
+if [ -z "$ALT_DOCKER_URL" ]; then
+    DOCKER_URL="${DOCKER_REGISTRY:-$DOCKER_URL}"
+else
+    DOCKER_URL="${ALT_DOCKER_URL}"
+fi
+CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \
+    -t -m "/x:settings/x:servers/x:server[x:id='${SERVER_ID}']" \
+    -v x:username -o ":" -v x:password \
+    "$SETTINGS_FILE")
+
+# Ensure we fail the job if any steps fail.
+set -eu -o pipefail
+
+# Handle when a project chooses to not archive logs to a log server
+# in other cases if CREDENTIAL is not found then fail the build.
+if [ -z "$CREDENTIAL" ] && [ "$SERVER_ID" == "logs" ]; then
+    echo "WARN: Log server credential not found."
+    exit 0
+elif [ -z "$CREDENTIAL" ] && [ "$SERVER_ID" == "ossrh" ]; then
+    echo "WARN: OSSRH credentials not found."
+    echo "      This is needed for staging to Maven Central."
+    exit 0
+elif [ -z "$CREDENTIAL" ]; then
+    echo "ERROR: Credential not found."
+    exit 1
+fi
+
+if [ "$SERVER_ID" == "ossrh" ]; then
+    machine="oss.sonatype.org"
+else
+    machine=$(echo "$DOCKER_URL")
+fi
+
+user=$(echo "$CREDENTIAL" | cut -f1 -d:)
+pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
+
+set +x  # Disable `set -x` to prevent printing passwords
+echo "machine ${machine%:*} login $user password $pass" >> ~/.netrc