diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 09e7f3a..314ddf9 100644
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -12,3 +12,49 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- nonrtric_jdk_common: &a1policymanagementservice_jdk_common
+    name: a1policymanagementservice-jdk-common
+    # git repo
+    project: nonrtric/plt/a1policymanagementservice
+    # jenkins job name prefix
+    project-name: nonrtric-plt-a1policymanagementservice
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-a1policymanagementservice-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *a1policymanagementservice_jdk_common
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+# nonrtric:a1policymanagementservice/
+# Maven artifacts for nonrtric-plt-a1policymanagementservice/
+- project:
+    <<: *a1policymanagementservice_jdk_common
+    name: nonrtric-plt-a1policymanagementservice
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *a1policymanagementservice_jdk_common
+    name: nonrtric-plt-a1policymanagementservice-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 76caf0d..095d12f 100644
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -12,3 +12,62 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- dmaapadapter_jdk_common: &dmaapadapter_jdk_common
+    name: dmaapadapter-jdk-common
+    # git repo
+    project: nonrtric/plt/dmaapadapter
+    # jenkins job name prefix
+    project-name: nonrtric-plt-dmaapadapter
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-dmaapadapter-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *dmaapadapter_jdk_common
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+# nonrtric:dmaapadapter/
+# Maven artifacts for nonrtric-plt-dmaapadapter/
+- project:
+    <<: *dmaapadapter_jdk_common
+    name: nonrtric-plt-dmaapadapter
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *dmaapadapter_jdk_common
+    name: nonrtric-plt-dmaapadapter-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *dmaapadapter_jdk_common
+    name: nonrtric-plt-dmaapadapter-sonar
+    project-name: '{name}'
+    # template goal install builds docker image unnecessarily
+    mvn-params: '-Ddocker.skip=true'
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-dmaapadapter'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar
diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties b/jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties
index cfb4092..1ed5387 100644
--- a/jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties
+++ b/jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties
@@ -13,4 +13,4 @@
 # Inclusions
 sonar.inclusions=main.go,internal/**/**.go
 # Exclusions
-sonar.exclusions=main_test.go,mocks/**.go,stub/**.go,internal/**/**_test.go
+sonar.exclusions=main_test.go,internal/restclient/mocks/**.go,internal/jobs/mocks/**.go,internal/kafkaclient/mocks/**.go,stub/**.go,internal/**/**_test.go
diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index a747bf2..21c25fb 100644
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -12,3 +12,49 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- helmmanager_jdk_common: &helmmanager_jdk_common
+    name: helmmanager-jdk-common
+    # git repo
+    project: nonrtric/plt/helmmanager
+    # jenkins job name prefix
+    project-name: nonrtric-plt-helmmanager
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-helmmanager-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *helmmanager_jdk_common
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+# nonrtric:helmmanager
+# Maven artifacts for helmmanager
+- project:
+    <<: *helmmanager_jdk_common
+    name: nonrtric-plt-helmmanager
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *helmmanager_jdk_common
+    name: nonrtric-plt-helmmanager-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 72e0eec..6b09c64 100644
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -12,3 +12,62 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- informationcoordinatorservice_jdk_common: &informationcoordinatorservice_jdk_common
+    name: informationcoordinatorservice-jdk-common
+    # git repo
+    project: nonrtric/plt/informationcoordinatorservice
+    # jenkins job name prefix
+    project-name: nonrtric-plt-informationcoordinatorservice
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-informationcoordinatorservice-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+# nonrtric:informationcoordinatorservice
+# Maven artifacts for nonrtric-plt-informationcoordinatorservice
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    name: nonrtric-plt-informationcoordinatorservice
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    name: nonrtric-plt-informationcoordinatorservice-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    name: nonrtric-plt-informationcoordinatorservice-sonar
+    project-name: '{name}'
+    # template goal install builds docker image unnecessarily
+    mvn-params: '-Ddocker.skip=true'
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-informationcoordinatorservice'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar
diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 4893678..7451d7a 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -44,8 +44,6 @@
     mvn-opts: '-Ddocker.skip=true'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
@@ -69,7 +67,7 @@
     mvn-params: '-Ddocker.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric_plt_rappcatalogue'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar
diff --git a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
index 1cfdd69..f512695 100644
--- a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
+++ b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
@@ -12,3 +12,49 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- sdnca1controller_jdk_common: &sdnca1controller_jdk_common
+    name: sdnca1controller-jdk-common
+    # git repo
+    project: nonrtric/plt/sdnca1controller
+    # jenkins job name prefix
+    project-name: nonrtric-plt-sdnca1controller
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-sdnca1controller-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *sdnca1controller_jdk_common
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+# nonrtric:nonrtric-plt-sdnca1controller
+# Maven artifacts for nonrtric-plt-sdnca1controller
+- project:
+    <<: *sdnca1controller_jdk_common
+    name: nonrtric-plt-sdnca1controller
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *sdnca1controller_jdk_common
+    name: nonrtric-plt-sdnca1controller-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
diff --git a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
index e8cb4d6..8f7e2df 100644
--- a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
+++ b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
@@ -12,3 +12,30 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- nonrtric-rapp-healthcheck_common: &nonrtric_rapp_healthcheck_common
+    name: nonrtric-rapp-healthcheck-common
+    # git repo
+    project: nonrtric/rapp/healthcheck
+    # jenkins job name prefix
+    project-name: nonrtric-rapp-healthcheck
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-rapp-healthcheck-settings
+
+- project:
+    <<: *nonrtric_rapp_healthcheck_common
+    name: nonrtric-rapp-healthcheck-verify
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-rapp-healthcheck'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index e63df7e..fde717c 100644
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -5,10 +5,103 @@
     views:
       - project-view
 
-- project:
+- project: &orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery-info
     project: nonrtric/rapp/orufhrecovery
     project-name: nonrtric-rapp-orufhrecovery
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-rapp-orufhrecovery-settings
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    <<: *orufhrecovery_common
+    name: nonrtric-rapp-orufhrecovery-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *orufhrecovery_common
+    name: nonrtric-rapp-orufhrecovery
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-rapp-orufhrecovery'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'scriptversion/app'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'scriptversion/app/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *orufhrecovery_common
+    name: nonrtric-rapp-orufhrecovery-consumer
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-rapp-orufhrecovery-consumer'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'goversion'
+    # Directory where go test should be run
+    go-root: 'goversion'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'goversion/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *orufhrecovery_common
+    name: nonrtric-rapp-orufhrecovery-consumer-sonar
+    project-name: '{name}'
+    # prescan script requires ubuntu
+    # golang is only on docker-enabled nodes
+    build-node: ubuntu1804-docker-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-oruclosedloopconsumer-ubuntu.sh
+    sonar-project-file: ""
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: |
+        # Required metadata
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_nonrtric-rapp-orufhrecovery-consumer
+        sonar.organization={sonarcloud_project_organization}
+        # Encoding
+        sonar.build.sourceEncoding=UTF-8
+        # Language
+        sonar.language=go
+        # Source
+        sonar.sources=.
+        # Unit tests
+        sonar.go.coverage.reportPaths=goversion/coverage.txt
+        # Inclusions
+        sonar.inclusions=goversion/internal/**/**.go,goversion/**.go
+        # Exclusions
+        sonar.exclusions=goversion/mocks/**.go,goversion/internal/**/**_test.go,goversion/**_test.go,goversion/simulator/**.go
+    jobs:
+      - gerrit-sonar-prescan-script
diff --git a/jjb/nonrtric-rapp-orufhrecovery/prescan-oruclosedloopconsumer-ubuntu.sh b/jjb/nonrtric-rapp-orufhrecovery/prescan-oruclosedloopconsumer-ubuntu.sh
new file mode 100644
index 0000000..5aef6ec
--- /dev/null
+++ b/jjb/nonrtric-rapp-orufhrecovery/prescan-oruclosedloopconsumer-ubuntu.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+##############################################################################
+#
+#   Copyright (C) 2021: Nordix Foundation
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+##############################################################################
+
+echo "--> prescan-oruclosedloopconsumer-ubuntu.sh"
+
+set -ex
+
+# Assumes ubuntu - uses apt-get
+sudo apt-get update
+
+# build script execution
+bash goversion/build-oruclosedloopconsumer-ubuntu.sh
+
+echo "--> prescan-oruclosedloopconsumer-ubuntu.sh ends"
diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index e49cf8c..adab68c 100644
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -56,6 +56,29 @@
 
 - project:
     <<: *ransliceassurance_common
+    name: nonrtric-rapp-ransliceassurance-icsversion
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'icsversion'
+    # Directory where go test should be run
+    go-root: 'icsversion'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *ransliceassurance_common
     name: nonrtric-rapp-ransliceassurance-sonar
     project-name: nonrtric-rapp-ransliceassurance
     # prescan script requires ubuntu
diff --git a/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh b/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh
index bcb4e31..5bc7e9c 100644
--- a/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh
+++ b/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh
@@ -26,5 +26,6 @@
 
 # build script execution
 bash smoversion/build-ransliceassurance-ubuntu.sh
+bash icsversion/build-ransliceassurance-ubuntu.sh
 
 echo "--> prescan-ransliceassurance-ubuntu.sh ends"
diff --git a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
index 38534a3..253b108 100644
--- a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
+++ b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
@@ -9,8 +9,8 @@
 # Source
 sonar.sources=.
 # Unit tests
-sonar.go.coverage.reportPaths=smoversion/coverage.txt
+sonar.go.coverage.reportPaths=smoversion/coverage.txt, icsversion/coverage.txt
 # Inclusions
-sonar.inclusions=smoversion/internal/**/**.go
+sonar.inclusions=smoversion/internal/**/**.go, icsversion/internal/**/**.go 
 # Exclusions
-sonar.exclusions=smoversion/main.go,smoversion/stub/**.go,smoversion/internal/**/**_test.go
+sonar.exclusions=smoversion/main.go,smoversion/stub/**.go,smoversion/internal/**/**_test.go, smoversion/main.go, icsversion/stub/**.go, icsversion/internal/**/**_test.go
diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 55c2ab6..4606935 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -32,35 +32,6 @@
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
     stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
-# nonrtric:a1-policy-management-service/
-# Maven artifacts for nonrtric-a1-policy-management-service/
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-a1-policy-management-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f a1-policy-management-service/'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'a1-policy-management-service/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
       - e-release:
           branch: e-release
 
@@ -82,8 +53,6 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
 
@@ -105,38 +74,11 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
       - e-release:
           branch: e-release
 
-# nonrtric:information-coordinator-service
-# Maven artifacts for nonrtric-information-coordinator-service
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-information-coordinator-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f information-coordinator-service'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'information-coordinator-service/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
-      - e-release:
-          branch: e-release
-
 # nonrtric:enrichment-coordinator-service
 # Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
@@ -155,118 +97,58 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - cherry:
-          branch: cherry
       - dawn:
           branch: dawn
 
 - project:
     <<: *nonrtric_jdk_common
+    name: nonrtric-auth-token-fetch
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-auth-token-fetch'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'auth-token-fetch'
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory where go test should be run
+    go-root: 'auth-token-fetch'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'auth-token-fetch/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-auth-token-fetch-sonar
+    project-name: nonrtric-auth-token-fetch
+    # prescan script requires ubuntu
+    # golang is only on docker-enabled nodes
+    build-node: ubuntu1804-docker-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-nonrtric-auth-token-fetch-ubuntu.sh
+    sonar-project-file: ""
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: !include-raw: sonar-project.properties
+    jobs:
+      - gerrit-sonar-prescan-script
+
+- project:
+    <<: *nonrtric_jdk_common
     name: nonrtric-release
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-sonar
-    project-name: '{name}'
-    # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    jobs:
-      - gerrit-maven-sonar
-
-# Usecases
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-recovery
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
-    # Directory with Dockerfile
-    docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-    stream:
-      - master:
-          branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-consumer
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer'
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
-    # Directory with Dockerfile
-    docker-root: 'test/usecases/oruclosedlooprecovery/goversion'
-    # Directory where go test should be run
-    go-root: 'test/usecases/oruclosedlooprecovery/goversion'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/goversion/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-      - gerrit-go-verify
-    stream:
-      - master:
-          branch: master
-      - e-release:
-          branch: e-release
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-consumer-sonar
-    project-name: nonrtric-o-ru-closed-loop-consumer-sonar
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
-    build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-oruclosedloopconsumer-ubuntu.sh
-    sonar-project-file: ""
-    java-version: openjdk11
-    # use sonarcloud values from defaults.yaml
-    sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_nonrtric-o-ru-closed-loop-consumer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=test/usecases/oruclosedlooprecovery/goversion/coverage.txt
-        # Inclusions
-        sonar.inclusions=test/usecases/oruclosedlooprecovery/goversion/internal/**/**.go,test/usecases/oruclosedlooprecovery/goversion/**.go
-        # Exclusions
-        sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go,test/usecases/oruclosedlooprecovery/goversion/**_test.go,test/usecases/oruclosedlooprecovery/goversion/simulator/**.go
-    jobs:
-      - gerrit-sonar-prescan-script
diff --git a/jjb/nonrtric/prescan-nonrtric-auth-token-fetch-ubuntu.sh b/jjb/nonrtric/prescan-nonrtric-auth-token-fetch-ubuntu.sh
new file mode 100644
index 0000000..b5f282b
--- /dev/null
+++ b/jjb/nonrtric/prescan-nonrtric-auth-token-fetch-ubuntu.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+##############################################################################
+#
+#   Copyright (C) 2021: Nordix Foundation
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+##############################################################################
+
+echo "--> $0"
+
+set -ex
+
+# Assumes ubuntu - uses apt-get
+sudo apt-get update
+
+# build script execution
+bash auth-token-fetch/run-tests-ubuntu.sh
+
+echo "--> $0 ends"
diff --git a/jjb/nonrtric/sonar-project.properties b/jjb/nonrtric/sonar-project.properties
index 4b499ff..36f8b51 100644
--- a/jjb/nonrtric/sonar-project.properties
+++ b/jjb/nonrtric/sonar-project.properties
@@ -9,8 +9,8 @@
 # Source
 sonar.sources=.
 # Unit tests
-sonar.go.coverage.reportPaths=dmaap-mediator-producer/coverage.txt
+sonar.go.coverage.reportPaths=auth-token-fetch/coverage.txt
 # Inclusions
-sonar.inclusions=dmaap-mediator-producer/internal/**/**.go
+sonar.inclusions=auth-token-fetch/**.go
 # Exclusions
-sonar.exclusions=dmaap-mediator-producer/main.go,dmaap-mediator-producer/mocks/**.go,dmaap-mediator-producer/stub/**.go,dmaap-mediator-producer/internal/**/**_test.go
+sonar.exclusions=auth-token-fetch/**_test.go
diff --git a/jjb/ric-plt-stslgo/ric-plt-stslgo.yaml b/jjb/ric-plt-stslgo/ric-plt-stslgo.yaml
new file mode 100644
index 0000000..73ab33d
--- /dev/null
+++ b/jjb/ric-plt-stslgo/ric-plt-stslgo.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: ric-plt-stslgo-project-view
+    project-name: ric-plt-stslgo
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-stslgo-info
+    project: ric-plt/stslgo
+    project-name: ric-plt-stslgo
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/packer/common-packer b/packer/common-packer
index 6485404..3dcae18 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 6485404dda02505f48cef60d9aafd726c3aacfa8
+Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe