diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d7da8ca..2c8d9cc 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -74,7 +74,7 @@
     failure-email-address: 'cord-dev@opencord.org'
 
     # Projects containing helm-charts
-    helm-charts-projects-regexp: '^(?!aether)(.*helm-charts|cord-platform|seba)$'
+    helm-charts-projects-regexp: '^(?!aether|roc)(.*helm-charts|cord-platform|seba)$'
 
     # regexp for gerrit triggers
     # list of supported branches, for branch-regexp
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 000cdb1..61a4711 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -25,7 +25,7 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
           kafka-version: '2.7.0'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.6.1'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.6.2'
           adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.4.0'
           rw-core-image: 'voltha/voltha-rw-core:2.9.3'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
@@ -56,8 +56,8 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
           kafka-version: '2.7.0'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.2'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.10'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.5'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.12'
           rw-core-image: 'voltha/voltha-rw-core:2.9.3'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
           onu-image-version: 'BBSM_IMG_00002'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 86668da..68a7b3f 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -49,13 +49,14 @@
           code-branch: 'master'
           volthaHelmChartsChange: refs/changes/69/26569/7
           extraHelmFlags: >
-            --set global.image_tag=master --set onos-classic.image.tag=master
-            --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
-            --set voltha.images.rw_core.tag=grpc_v1
-            --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
-            --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
-            --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
-            --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
+            --set global.image_tag=master
+            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=port-remove
+            --set voltha.images.rw_core.repository=dbainbriciena/voltha-rw-core
+            --set voltha.images.rw_core.tag=grpc009
+            --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=dbainbriciena/voltha-openonu-adapter-go
+            --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc009
+            --set voltha-adapter-openolt.images.adapter_open_olt.repository=dbainbriciena/voltha-openolt-adapter
+            --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc009
             --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
             --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
             --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
@@ -242,13 +243,14 @@
           code-branch: 'master'
           volthaHelmChartsChange: refs/changes/69/26569/7
           extraHelmFlags: >
-            --set global.image_tag=master --set onos-classic.image.tag=master
-            --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
-            --set voltha.images.rw_core.tag=grpc_v1
-            --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
-            --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
-            --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
-            --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
+            --set global.image_tag=master
+            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=port-remove
+            --set voltha.images.rw_core.repository=dbainbriciena/voltha-rw-core
+            --set voltha.images.rw_core.tag=grpc009
+            --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=dbainbriciena/voltha-openonu-adapter-go
+            --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc009
+            --set voltha-adapter-openolt.images.adapter_open_olt.repository=dbainbriciena/voltha-openolt-adapter
+            --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc009
             --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
             --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
             --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
@@ -720,6 +722,27 @@
           timeout: 140
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-pm-data-test-bbsim-2.8'
+          code-branch: 'voltha-2.8'
+          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: voltha-pm-data-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+            - target: voltha-pm-data-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+            - target: voltha-pm-data-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+          timeout: 140
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
@@ -766,6 +789,28 @@
           timeout: 180
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.8'
+          code-branch: 'voltha-2.8'
+          extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          olts: 2
+          timeout: 180
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: voltha-pm-data-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+            - target: voltha-pm-data-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+            - target: voltha-pm-data-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+          time-trigger: "H H/23 * * *"
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-test-DMI'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
           code-branch: 'master'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index af135ff..ce66cd0 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -76,9 +76,9 @@
             --set services.etcd.address=voltha-infra-etcd.default.svc:2379
             --set global.tracing.enabled=true
           volthaHelmChartsChange: refs/changes/69/26569/7
-          rwCoreImg: 'volthacore/voltha-rw-core:grpc_v1'
-          openoltAdapterImg: 'volthacore/voltha-openolt-adapter:grpc_v1'
-          openonuAdapterGoImg: 'volthacore/voltha-openonu-adapter-go:grpc_v1'
+          rwCoreImg: 'dbainbriciena/voltha-rw-core:grpc009'
+          openoltAdapterImg: 'dbainbriciena/voltha-openolt-adapter:grpc009'
+          openonuAdapterGoImg: 'dbainbriciena/voltha-openonu-adapter-go:grpc009'
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers-grpc'
           'disable-job': false
@@ -106,9 +106,9 @@
             --set services.etcd.address=voltha-infra-etcd.default.svc:2379
             --set global.tracing.enabled=true
           volthaHelmChartsChange: refs/changes/69/26569/3
-          rwCoreImg: 'volthacore/voltha-rw-core:grpc_v1'
-          openoltAdapterImg: 'volthacore/voltha-openolt-adapter:grpc_v1'
-          openonuAdapterGoImg: 'volthacore/voltha-openonu-adapter-go:grpc_v1'
+          rwCoreImg: 'dbainbriciena/voltha-rw-core:grpc009'
+          openoltAdapterImg: 'dbainbriciena/voltha-openolt-adapter:grpc009'
+          openonuAdapterGoImg: 'dbainbriciena/voltha-openonu-adapter-go:grpc009'
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-grpc'
           'disable-job': false
@@ -136,9 +136,9 @@
             --set services.etcd.address=voltha-infra-etcd.default.svc:2379
             --set global.tracing.enabled=true
           volthaHelmChartsChange: refs/changes/69/26569/3
-          rwCoreImg: 'volthacore/voltha-rw-core:grpc_v1'
-          openoltAdapterImg: 'volthacore/voltha-openolt-adapter:grpc_v1'
-          openonuAdapterGoImg: 'volthacore/voltha-openonu-adapter-go:grpc_v1'
+          rwCoreImg: 'dbainbriciena/voltha-rw-core:grpc009'
+          openoltAdapterImg: 'dbainbriciena/voltha-openolt-adapter:grpc009'
+          openonuAdapterGoImg: 'dbainbriciena/voltha-openonu-adapter-go:grpc009'
 
       # OLT app rewrite jobs
       - 'voltha-scale-measurements':