diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 9bbe473..6e60b7d 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,48 +24,26 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-single-kind
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: bbsim-alarms-kind
-              workflow: att
-              flags: ""
-              teardown: false
-            - target: bbsim-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-            - target: bbsim-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-grpc'
-          code-branch: 'master'
           volthaHelmChartsChange: refs/changes/69/26569/11
-          volthaSystemTestsChange: refs/changes/60/27660/1
           gerritProject: voltctl
           gerritRefspec: refs/changes/83/26983/4
           extraHelmFlags: >
-            --set global.image_tag=master
-            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple
-            --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 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
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
-            --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
-            --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind
@@ -89,7 +67,27 @@
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set onu=2,pon=2
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multi-olt
@@ -160,7 +158,27 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind-multiuni-att
@@ -180,7 +198,27 @@
           name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multiuni-multiolt-att
@@ -201,7 +239,27 @@
           name: 'periodic-voltha-multi-uni-test-bbsim-2.8'
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
           code-branch: 'voltha-2.8'
-          extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind-multiuni-att
@@ -242,95 +300,28 @@
       # openonu Go periodic tests
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-openonu-go-test-bbsim-grpc'
+          name: 'periodic-voltha-openonu-go-test-bbsim'
           code-branch: 'master'
           volthaHelmChartsChange: refs/changes/69/26569/11
-          volthaSystemTestsChange: refs/changes/60/27660/1
           gerritProject: voltctl
           gerritRefspec: refs/changes/83/26983/4
           extraHelmFlags: >
-            --set global.image_tag=master
-            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple
-            --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 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
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
-            --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
-            --set services.etcd.address=voltha-infra-etcd.default.svc:2379
-          time-trigger: "H H/4 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: 1t4gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: 1t8gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: mib-upload-templating-openonu-go-adapter-test
-              workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
-              teardown: true
-            - target: reconcile-openonu-go-adapter-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: reconcile-openonu-go-adapter-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-            - target: reconcile-openonu-go-adapter-test-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-            - target: openonu-go-adapter-omci-hardening-passed-test
-              workflow: att
-              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
-              teardown: true
-            - target: openonu-go-adapter-omci-hardening-failed-test
-              workflow: att
-              flags: "--set omci_response_rate=7"
-              teardown: true
-            - target: voltha-onu-omci-get-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: voltha-onu-omci-get-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-            - target: voltha-onu-omci-get-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-            - target: voltha-onu-flows-check-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-            - target: voltha-onu-flows-check-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-            - target: voltha-onu-flows-check-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-openonu-go-test-bbsim'
-          code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+              --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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
           time-trigger: "H H/12 * * *"
           logLevel: 'DEBUG'
           testTargets: |
@@ -524,7 +515,27 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set onu=2,pon=2
           olts: 2
           logLevel: 'DEBUG'
           testTargets: |
@@ -686,7 +697,27 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-pm-data-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --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: |
@@ -752,7 +783,28 @@
       - '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'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --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'
@@ -844,7 +896,28 @@
           name: 'periodic-voltha-etcd-test'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set onu=2,pon=2
           time-trigger: "H H/12 * * *"
           testTargets: |
             - target: sanity-multi-kind
@@ -869,7 +942,28 @@
           name: 'periodic-voltha-sanity-test-multi-runs'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          volthaHelmChartsChange: refs/changes/69/26569/11
+
+          gerritProject: voltctl
+          gerritRefspec: refs/changes/83/26983/4
+          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 voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
+              --set voltha.images.ofagent.tag=grpc_v1
+              --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
+              --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
+              --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
+              --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+              --set onu=2,pon=2
           testTargets: |
             - target: sanity-kind
               workflow: att