diff --git a/INFO.yaml b/INFO.yaml
index 801bb85..bf38e97 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -61,5 +61,10 @@
       company: 'samsung'
       id: 'kaihlavi'
       timezone: 'Europe/Helsinki'
+    - name: 'Kevin Sandi'
+      email: 'ksandi@contractor.linuxfoundation.org'
+      company: 'LF'
+      id: 'kevin.sandi'
+      timezone: 'America/Costa_Rica'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
diff --git a/global-jjb b/global-jjb
index cc281da..ff3ea7c 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit cc281dac5f29fec045c7332094d55faa98acd924
+Subproject commit ff3ea7c20d4ea68079502f20efa885b298bc6cb2
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index deb6a44..f72d6cc 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis -  - 150380303-3006
+IMAGE_NAME=CentOS 7 - redis -  - 50880808-8011
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 26892ac..17525af 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,4 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20210318-054700.866
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220428-144254.000
 LABELS=ubuntu1804-helm-2c-1g
-HARDWARE_ID=v3-standard-2
-VOLUME_SIZE=50
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml
index 33a3248..af112b7 100644
--- a/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/dcae-utils-settings/serverCredentialMappings.yaml
@@ -6,6 +6,8 @@
     credentialsId: *cred
   - serverId: "ecomp-staging"
     credentialsId: *cred
+  - serverId: "ecomp-raw"
+    credentialsId: *cred
   - serverId: "nexus3.onap.org:10001"
     credentialsId: "read-only-docker"
   - serverId: "nexus3.onap.org:10002"
diff --git a/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml
index 3e30446..d7078ff 100644
--- a/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/dcaegen2-utils-settings/serverCredentialMappings.yaml
@@ -6,6 +6,8 @@
     credentialsId: *cred
   - serverId: "ecomp-staging"
     credentialsId: *cred
+  - serverId: "ecomp-raw"
+    credentialsId: *cred
   - serverId: "nexus3.onap.org:10001"
     credentialsId: "read-only-docker"
   - serverId: "nexus3.onap.org:10002"
diff --git a/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml
index 6ba05c6..5d9d9f9 100644
--- a/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml
@@ -16,3 +16,5 @@
     credentialsId: *cred
   - serverId: "docker.io"
     credentialsId: "onap_dockerhub_creds"
+  - serverId: "oom-helm"
+    credentialsId: "oom"
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 6623edd..d56a6e4 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -25,8 +25,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-version: 'mvn35'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 59e4bf7..3def2f3 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -8,8 +8,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 5778cb5..af49108 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -8,8 +8,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     # apply to all jobs
     java-version: openjdk11
     project: 'dcaegen2/collectors/hv-ves'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 31c2a67..9c6d8cf 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -24,8 +24,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 799fd78..a253c12 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -10,8 +10,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     jobs:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 7fa8ef5..b37d40c 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -25,8 +25,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     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 1421ef0..6345f73 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -14,8 +14,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
deleted file mode 100644
index a36be28..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-blueprints
-    project-name: 'dcaegen2-platform-blueprints'
-    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/blueprints'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dcaegen2-platform-blueprints-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-blueprints-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/blueprints
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-blueprints'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-blueprints-settings'
-
-- project:
-    name: dcaegen2-platform-blueprints-info
-    project-name: dcaegen2-platform-blueprints
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/blueprints
-    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
deleted file mode 100644
index ff838dd..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-configbinding
-    # git repo
-    project: dcaegen2/platform/configbinding
-    # jenkins job prefix
-    project-name: dcaegen2-platform-configbinding
-    # push credentials
-    mvn-settings: dcaegen2-platform-configbinding-settings
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-    # used by tox-install.sh to specify the interpreter used to install tox
-    python-version: python3
-    jobs:
-      # clm and tox
-      - '{project-name}-python-jobs'
-      # build docker image
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - gerrit-release-verify:
-          build-node: centos7-docker-8c-8g
-      - gerrit-release-merge:
-          build-node: centos7-docker-8c-8g
-    stream:
-      - master:
-          branch: master
-      - istanbul:
-          branch: istanbul
-      - honolulu:
-          branch: honolulu
-
-- project:
-    name: dcaegen2-platform-configbinding-sonar
-    jobs:
-      - gerrit-tox-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/configbinding'
-    project-name: 'dcaegen2-platform-configbinding'
-    branch: 'master'
-    # used by tox-install.sh to specify the interpreter used to install tox
-    python-version: python3
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
-    mvn-goals: 'clean test'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
-    name: dcaegen2-platform-configbinding-info
-    project: dcaegen2/platform/configbinding
-    project-name: dcaegen2-platform-configbinding
-    branch: master
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 369e6f4..bb4cd6c 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -97,8 +97,8 @@
           branch: master
       - istanbul:
           branch: istanbul
-      - honolulu:
-          branch: honolulu
+      - jakarta:
+          branch: jakarta
 
     views:
       - project-view:
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
deleted file mode 100644
index e50fc88..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod-bpgenerator
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          project-name: dcaegen2-platform-mod-bpgenerator
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          version-properties-file: 'mod/bpgenerator/version.properties'
-          mvn-pom: 'mod/bpgenerator/pom.xml'
-          mvn-params: '-f mod/bpgenerator/pom.xml'
-          pattern: 'mod/bpgenerator/**'
-    subproject:
-      - 'bpgenerator':
-          pom: 'mod/bpgenerator/pom.xml'
-          pattern: 'mod/bpgenerator/**'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-settings: 'dcaegen2-platform-settings'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-mod-bpgenerator-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-mod-bpgenerator'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod/bpgenerator/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index fc8539c..59c7312 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -17,8 +17,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index b5af558..2787f50 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'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 299c042..d4e41d6 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'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
index 6840746..a34faf3 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
@@ -24,7 +24,9 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+    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
deleted file mode 100644
index 74dc768..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-plugins
-    project-name: 'dcaegen2-platform-plugins'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-          python-version: python3
-      - '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
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'centos7-redis-4c-4g'
-
-- project:
-    name: dcaegen2-platform-plugins-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: centos7-redis-4c-4g
-    project: 'dcaegen2/platform/plugins'
-    project-name: 'dcaegen2-platform-plugins'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-plugins-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/plugins
-    build-node: centos7-redis-4c-4g
-    project-name: 'dcaegen2-platform-plugins'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-
-- project:
-    name: dcaegen2-platform-plugins-info
-    project-name: dcaegen2-platform-plugins
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/platform/plugins
-    branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 2fd96bd..8641760 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -22,10 +22,10 @@
       stream:
           - 'master':
               branch: 'master'
-          - 'honolulu':
-              branch: 'honolulu'
           - 'istanbul':
               branch: 'istanbul'
+          - 'jakarta':
+              branch: 'jakarta'
       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-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
deleted file mode 100644
index f70c722..0000000
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: dcaegen2-bbs-event-processor-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-services-bbs-event-processor'
-    recipients: 'vv770d@att.com stavros.kanarakis@nokia.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'bbs-testsuites':
-          trigger_jobs:
-            - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java'
-    robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 837e17d..e7b05d2 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -15,8 +15,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     maven-version: 'mvn35'
     mvn-settings: 'dcaegen2-services-settings'
@@ -50,8 +50,8 @@
          branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
@@ -84,8 +84,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
@@ -118,8 +118,8 @@
          branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 0c52bae..9eb155b 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -109,6 +109,8 @@
           branch: master
       - istanbul:
           branch: istanbul
+      - jakarta:
+          branch: jakarta
     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 82ee025..cb616bf 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -13,10 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 3308f7e..232a499 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -13,10 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 31a6bc5..dd6dab7 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -22,10 +22,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 409e5f8..7b54460 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,10 +6,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 0135244..5399481 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -20,10 +20,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 7f43758..1e61d4a 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -16,10 +16,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 d6956ca..e040b72 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'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
@@ -47,8 +47,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
     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 d6b9c76..2b0e443 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'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 624f74d..fca7af2 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,10 +13,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     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 cf65da2..46c501e 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,8 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
       - 'istanbul':
           branch: 'istanbul'
     mvn-settings: 'dcaegen2-settings'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index a89f6bd..b74439e 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,7 +6,7 @@
       - project-view
 
 - project:
-    name: dmaap-buscontroller-java11
+    name: dmaap-buscontroller-java
     project-name: 'dmaap-buscontroller'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -22,35 +22,14 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
 - project:
-    name: dmaap-buscontroller-maintenance-java11
-    project-name: 'dmaap-buscontroller-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package -P docker docker:build docker:push -DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'dmaap/buscontroller'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    files: '**'
-    archive-artifacts: ''
-    java-version: openjdk11
-    cron: ''
-
-- project:
     name: dmaap-buscontroller-csit
     jobs:
       - '{project-name}-review-verification-maven-{stream}':
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 1a8f5ff..530a7b2 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dmaap-datarouter-java11
+    name: dmaap-datarouter-java
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -17,36 +17,14 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
 - project:
-    name: dmaap-datarouter-maintenance-java11
-    project-name: 'dmaap-datarouter-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-goals: 'clean package -P docker docker:build docker:push'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'dmaap/datarouter'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dmaap-datarouter-settings'
-    files: '**'
-    archive-artifacts: ''
-    java-version: openjdk11
-    cron: ''
-
-- project:
     name: dmaap-datarouter-csit-ssl
     jobs:
       - '{project-name}-review-verification-maven-{stream}':
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 8e0dbf6..34fe57b 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: dmaap-messagerouter-dmaapclient-java11
-    project-name: 'dmaap-messagerouter-dmaapclient-java11'
+    name: dmaap-messagerouter-dmaapclient-java
+    project-name: 'dmaap-messagerouter-dmaapclient-java'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -15,33 +15,14 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
 - project:
-    name: dmaap-messagerouter-dmaapclient-maintenance
-    project-name: 'dmaap-messagerouter-dmaapclient-maintenance'
-    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/dmaapclient'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
-    files: '**'
-    archive-artifacts: ''
-    cron: ''
-
-- project:
     name: dmaap-messagerouter-dmaapclient-sonar
     jobs:
       - gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
index ff785c5..8b404ea 100644
--- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
@@ -23,29 +23,6 @@
     java-version: openjdk11
 
 - project:
-    name: dmaap-kafka-maintenance
-    project-name: 'dmaap-kafka-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - 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'
-    project: 'dmaap/kafka11aaf'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-    files: '**'
-    archive-artifacts: ''
-    cron: ''
-
-- project:
     name: dmaap-kafka-sonar
     jobs:
       - gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 8320488..a679666 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: dmaap-messagerouter-messageservice-java-11
-    project-name: 'dmaap-messagerouter-messageservice-java-11'
+    name: dmaap-messagerouter-messageservice-java
+    project-name: 'dmaap-messagerouter-messageservice-java'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     java-version: openjdk11
     files: '**'
@@ -25,30 +27,6 @@
     mvn-profile: 'docker'
 
 - project:
-    name: dmaap-messagerouter-messageservice-maintenance
-    project-name: 'dmaap-messagerouter-messageservice-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'dmaap/messagerouter/messageservice'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    cron: ''
-
-- project:
     name: dmaap-csit
     jobs:
       - '{project-name}-review-verification-maven-{stream}':
diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index 8186cc3..bb778ac 100644
--- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
@@ -23,30 +23,6 @@
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
-    name: dmaap-zookeeper-maintenance
-    project-name: 'dmaap-zookeeper-maintenance'
-    jobs:
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'dmaap/zookeeper'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dmaap-zookeeper-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    build-node: ubuntu1804-docker-8c-8g
-    cron: ''
-
-- project:
     name: dmaap-zookeeper-info
     project-name: dmaap-zookeeper
     jobs:
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 0c614bf..50a9a57 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -370,8 +370,9 @@
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
                 exclude-no-code-change: 'false'
+                exclude-trivial-rebase: 'true'
+                exclude-wip: 'true'
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index df2ef5c..475efa0 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -115,7 +115,7 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - oom-create-netrc:
@@ -164,7 +164,7 @@
           properties-content: 'HELM_MODULE={helm-module}'
       - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -207,10 +207,10 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > 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: |
@@ -252,10 +252,10 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > 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: |
@@ -273,7 +273,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -288,7 +288,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - inject:
@@ -319,7 +319,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 196a53e..0c9b885 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
 
     jobs:
       - '{project-name}-{stream}-review':
@@ -39,8 +39,8 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
 
 - project:
       name: offline-installer-pytest
@@ -58,5 +58,5 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
index b466f19..4b7ec30 100644
--- a/jjb/oom/oom-consul.yaml
+++ b/jjb/oom/oom-consul.yaml
@@ -36,8 +36,6 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'frankfurt':
-                branch: 'frankfurt'
 
 
 - project:
diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml
deleted file mode 100644
index e70dac9..0000000
--- a/jjb/oom/oom-helm-legacy.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- project:
-    name: oom-legacy
-    project-name: oom-legacy
-    project: oom-legacy
-    mvn-settings: oom-settings
-    mvn-global-settings: global-settings
-    archive-artifacts: ""
-    build-node: ubuntu1804-helm-2c-1g
-    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
-    oom_build_script: |
-      #!/bin/bash
-      source helm.prop
-      set -e -o pipefail
-      cd kubernetes/
-      make HELM_BIN=$HELM_BIN all
-    subproject_build_script: |
-      #!/bin/bash
-      cd kubernetes/
-      make HELM_BIN=$HELM_BIN common
-      make HELM_BIN=$HELM_BIN {subproject}
-
-    helm_bin:
-      - helm3.5
-      - helm3.3
-
-    exclude:
-      - stream: guilin
-        helm_bin: helm3.5
-      - stream: frankfurt
-        helm_bin: helm3.5
-      - stream: frankfurt
-        helm_bin: helm3.3
-      - stream: dublin
-        helm_bin: helm3.5
-      - stream: dublin
-        helm_bin: helm3.3
-      - stream: casablanca
-        helm_bin: helm3.5
-      - stream: casablanca
-        helm_bin: helm3.3
-
-    stream:
-      - "guilin":
-          branch: "guilin"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "dublin":
-          branch: "dublin"
-      - "casablanca":
-          branch: "casablanca"
-
-    subproject:
-      - "aai":
-          files: "kubernetes/aai/**"
-      - "robot":
-          files: "kubernetes/robot/**"
-
-    jobs:
-      - "{project-name}-{stream}-image-verify":
-          files: "**"
-      - "{project-name}-{stream}-verify-helm2":
-          files: "**"
-          build-timeout: 360
-      - "{project-name}-{stream}-verify-{helm_bin}":
-          build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 360
-      - "{project-name}-{stream}-merge-helm":
-          build_script: "{oom_build_script}"
-          files: "**"
-      - "{project-name}-{stream}-release-helm":
-          build_script: "{oom_build_script}"
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: "**"
-
-      # Below jobs disabled until future need.
-      - "{project-name}-{subproject}-{stream}-verify-helm2":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{subproject}-{stream}-merge-helm":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{stream}-update-helm-weekly":
-          build_script: "{oom_build_script}"
-          files: "**"
diff --git a/jjb/oom/oom-helm-verify-helm2.yaml b/jjb/oom/oom-helm-verify-helm2.yaml
deleted file mode 100644
index f816e4c..0000000
--- a/jjb/oom/oom-helm-verify-helm2.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- job-template: &helm-verify2
-    name: "{project-name}-{stream}-verify-helm2"
-    concurrent: true
-    branch: master
-    submodule-recursive: true
-    build_script: ""
-    post_build_script: ""
-    pre_build_script: ""
-    submodule-disable: false
-    submodule-timeout: 10
-
-    project-type: freestyle
-    node: "{build-node}"
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: "{build-days-to-keep}"
-
-    parameters:
-      - lf-infra-parameters:
-          branch: "{branch}"
-          project: "{project}"
-          stream: "{stream}"
-          lftools-version: "{lftools-version}"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
-
-    publishers:
-      - lf-infra-publish
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: "$GERRIT_REFSPEC"
-          choosing-strategy: "gerrit"
-          submodule-recursive: "{submodule-recursive}"
-
-    triggers:
-      - gerrit-trigger-helm-patch-submitted:
-          status-context: "{project}-Helm-Verify"
-          server: "{server-name}"
-          project: "{project}"
-          branch: "{branch}"
-          files: "{files}"
-
-    builders:
-      - lf-infra-pre-build
-      - shell: !include-raw-escape: shell/helm2-repo-init.sh
-      - shell: !include-raw-escape: shell/helm2-verify.sh
-
-- job-template:
-    <<: *helm-verify2
-    name: "{project-name}-{subproject}-{stream}-verify-helm2"
-
-    builders:
-      - lf-infra-pre-build
-      - shell: !include-raw-escape: shell/helm2-repo-init.sh
-      - shell: "cd kubernetes/ ; make common ; make {subproject}"
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 8336695..6491437 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -14,23 +14,24 @@
       set -e -o pipefail
       cd kubernetes/
       make HELM_BIN=$HELM_BIN all
-    subproject_build_script: |
+    oom_build_script_skip_lint: |
       #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
       cd kubernetes/
-      make HELM_BIN=$HELM_BIN common
-      make HELM_BIN=$HELM_BIN {subproject}
+      make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all
 
     stream:
       - "master":
           branch: "master"
+      - "jakarta":
+          branch: "jakarta"
       - "istanbul":
           branch: "istanbul"
-      - "honolulu":
-          branch: "honolulu"
+
 
     helm_bin:
-      - helm3.5
-      - helm3.3
+      - helm3.6
 
     exclude: []
     subproject: []
@@ -40,26 +41,15 @@
           files: "**"
       - "{project-name}-{stream}-verify-{helm_bin}":
           build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 600
+          files: "kubernetes/**"
+          build-timeout: 900
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
-          build-timeout: 600
+          build-timeout: 900
       - "{project-name}-{stream}-release-helm":
-          build_script: "{oom_build_script}"
+          build_script: "{oom_build_script_skip_lint}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
-          build-timeout: 600
-
-      # Below jobs disabled until future need.
-      - "{project-name}-{subproject}-{stream}-verify-helm2":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{subproject}-{stream}-verify-helm":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{subproject}-{stream}-merge-helm":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{stream}-update-helm-weekly":
-          build_script: "{oom_build_script}"
-          files: "**"
+          build-timeout: 900
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index ca1708e..b6653d4 100644
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -32,22 +32,5 @@
           branch: "master"
       - "istanbul":
           branch: "istanbul"
-      - "honolulu":
-          branch: "honolulu"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "guilin":
-          branch: "guilin"
-    exclude:
-      - stream: "honolulu"
-        subproject: "checkbashisms"
-      - stream: "frankfurt"
-        subproject: "checkbashisms"
-      - stream: "guilin"
-        subproject: "checkbashisms"
-      - stream: "honolulu"
-        subproject: "pre-commit"
-      - stream: "frankfurt"
-        subproject: "pre-commit"
-      - stream: "guilin"
-        subproject: "pre-commit"
+      - "jakarta":
+          branch: "jakarta"
diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
index b43b4a0..5a8257b 100644
--- a/jjb/oom/oom-readiness.yaml
+++ b/jjb/oom/oom-readiness.yaml
@@ -31,8 +31,8 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'frankfurt':
-                branch: 'frankfurt'
+          - 'jakarta':
+                branch: 'jakarta'
 
 - project:
     name: oom-readiness-release
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 43f0db8..e4eff9d 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -4,6 +4,7 @@
     project-name: sdc-sdc-workflow
     views:
       - project-view
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer
@@ -23,6 +24,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+    java-version: openjdk11
 
     project: 'sdc/sdc-workflow-designer'
     stream:
@@ -56,6 +58,7 @@
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer-clm
@@ -71,6 +74,7 @@
       - 'jakarta':
           branch: 'jakarta'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer-info
@@ -80,3 +84,4 @@
     build-node: centos7-builder-2c-1g
     project: sdc/sdc-workflow-designer
     branch: master
+    java-version: openjdk11
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index 3668479..d230d00 100644
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -39,8 +39,8 @@
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
           java-version: openjdk11
     mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
     files: '**'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 7f71b50..510e108 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -29,8 +29,8 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
           java-version: openjdk11
       - 'recursive-orch':
           branch: 'recursive-orch'
@@ -101,8 +101,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'so-settings'
 
 - project:
@@ -117,6 +117,6 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
           java-version: openjdk11
diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
index 0befe7b..edf34bb 100644
--- a/jjb/usecases/usecases-csit.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -13,7 +13,7 @@
       - 'pnf-sw-upgrade':
           trigger_jobs:
     robot-options: ''
-    cron: ''
+    disabled: 'true'
 
 - project:
     name: usecases-config-over-netconf
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 6127944..519c447 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -87,7 +87,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     build-node: centos7-docker-8c-8g
-    project: 'vnfsdk-refrepo'
+    project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
     mvn-settings: 'vnfsdk-refrepo-settings'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index d68c2ab..4364220 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -96,7 +96,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     build-node: centos7-docker-8c-8g
-    project: 'vnfsdk-validation'
+    project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
diff --git a/packer/common-packer b/packer/common-packer
index 3dcae18..cb6e121 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe
+Subproject commit cb6e121196cfd33a9a4348368f34d2c37e152bfd
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 479be53..2ab517f 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,10 +6,8 @@
   become_method: sudo
 
   vars:
-    kubectl_version: 1.15.11
-    helm_version: 2.16.6
-    helm3_3_version: 3.3.4
-    helm3_5_version: 3.5.1
+    kubectl_version: 1.19.11
+    helm3_6_version: 3.6.3
     chartmuseum_version: 0.12.0
 
   tasks:
@@ -20,88 +18,37 @@
         mode: 0775
       become: yes
 
-    - name: 'Install Helm {{helm_version}}'
+    - name: 'Install Helm3.6 {{helm3_6_version}}'
       block:
-        - name: 'Fetch tar.gz for {{helm_version}}'
-          get_url:
-            url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz"
-            dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
-        - name: 'Unarchive {{helm_version}}'
-          unarchive:
-            src: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
-            dest: /tmp
-            remote_src: true
-          become: yes
-        - name: 'Move {{helm_version}} bin to /usr/local/bin and set as executable'
-          command: 'mv /tmp/linux-amd64/helm /usr/local/bin/helm'
-          become: yes
-        - name: 'Check Helm {{helm_version}}'
-          command: 'which helm'
-
-    - name: 'Install Helm 3.3 {{helm3_3_version}}'
-      block:
-        - name: 'Create directory /tmp/helm3_3'
+        - name: 'Create directory /tmp/helm3.6'
           file:
-            path: /tmp/helm3_3
+            path: /tmp/helm3.6
             state: directory
-        - name: 'Fetch tar.gz for Helm 3.3'
+        - name: 'Fetch tar.gz for Helm 3.6'
           get_url:
-            url: "https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3_3
-        - name: 'Unarchive Helm 3.3'
+            url: "https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.6
+        - name: 'Unarchive Helm 3.6'
           unarchive:
-            src: "/tmp/helm3_3/helm-v{{helm3_3_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3_3
+            src: "/tmp/helm3.6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.6
             remote_src: true
           become: yes
-        - name: 'Move Helm 3.3 bin to /usr/local/bin and set as executable'
-          command: 'mv /tmp/helm3_3/linux-amd64/helm /usr/local/bin/helm3.3'
+        - name: 'Move Helm 3.6 bin to /usr/local/bin and set as executable'
+          command: 'mv /tmp/helm3.6/linux-amd64/helm /usr/local/bin/helm3.6'
           become: yes
-        - name: 'Check Helm 3.3'
-          command: 'which helm3.3'
+        - name: 'Check Helm 3.6'
+          command: 'which helm3.6'
         - name: 'Check kubectl {{kubectl_version}}'
           command: 'which kubectl'
 
-        - name: 'Install Helm 3.3'
+        - name: 'Install Helm 3.6'
           shell: |
-             echo "----> Installing helm 3.3"
-             wget 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz'
-             tar -xvf 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz'
-             mv linux-amd64/helm /usr/local/bin/helm3.3
-             which helm3.3
-          become: true
-
-    - name: 'Install Helm3.5 {{helm3_5_version}}'
-      block:
-        - name: 'Create directory /tmp/helm3.5'
-          file:
-            path: /tmp/helm3.5
-            state: directory
-        - name: 'Fetch tar.gz for Helm 3.5'
-          get_url:
-            url: "https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3.5
-        - name: 'Unarchive Helm 3.5'
-          unarchive:
-            src: "/tmp/helm3.5/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3.5
-            remote_src: true
-          become: yes
-        - name: 'Move Helm 3.5 bin to /usr/local/bin and set as executable'
-          command: 'mv /tmp/helm3.5/linux-amd64/helm /usr/local/bin/helm3.5'
-          become: yes
-        - name: 'Check Helm 3.5'
-          command: 'which helm3.5'
-        - name: 'Check kubectl {{kubectl_version}}'
-          command: 'which kubectl'
-
-        - name: 'Install Helm 3.5'
-          shell: |
-             echo "----> Installing helm3.5"
-             wget 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
-             tar -xvf 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
-             mv linux-amd64/helm /usr/local/bin/helm3.5
-             which helm3.5
+             echo "----> Installing helm3.6"
+             wget 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
+             tar -xvf 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
+             mv linux-amd64/helm /usr/local/bin/helm3.6
+             which helm3.6
           become: true
 
     - name: 'Install ChartMuseum {{chartmuseum_version}}'
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 9568c01..cdf752a 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -1,6 +1,7 @@
 {
   "variables": {
     "ansible_roles_path": ".galaxy",
+    "arch": "x86_64",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -9,6 +10,7 @@
     "cloud_network": null,
     "cloud_tenant": null,
     "cloud_user_data": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
@@ -31,7 +33,7 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
+      "flavor": "{{user `flavor`}}",
       "metadata": {
         "ci_managed": "yes"
       }
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 6cdab9d..6554fb6 100644
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -1,6 +1,7 @@
 {
   "variables": {
     "ansible_roles_path": ".galaxy",
+    "arch": "x86_64",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -9,6 +10,7 @@
     "cloud_network": null,
     "cloud_tenant": null,
     "cloud_user_data": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
@@ -30,7 +32,7 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
+      "flavor": "{{user `flavor`}}",
       "metadata": {
         "ci_managed": "yes"
       }
diff --git a/shell/helm2-repo-init.sh b/shell/helm2-repo-init.sh
deleted file mode 100755
index 23bcdce..0000000
--- a/shell/helm2-repo-init.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# Ensure we fail the job if any steps fail
-set -e -o pipefail
-
-# client only init, tiller will not be installed
-helm init --client-only --skip-refresh
-helm repo rm stable
-cd kubernetes/ || exit
-make repo
-cd ..
diff --git a/shell/helm2-verify.sh b/shell/helm2-verify.sh
deleted file mode 100755
index c652a5c..0000000
--- a/shell/helm2-verify.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Ensure we fail the job if any steps fail
-set -e -o pipefail
-
-cd kubernetes/
-make all
diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh
index be0fa96..4cc27fe 100755
--- a/shell/publish_helm_charts.sh
+++ b/shell/publish_helm_charts.sh
@@ -22,7 +22,7 @@
       ;;
     'release')
       echo "  * release build, pushing to https://nexus3.onap.org/repository/onap-helm-release/"
-      curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/"
+      curl -vn --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/"
         ;;
     *)
       echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."