diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index f4454fb..39dd9bc 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -61,7 +61,26 @@
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
 
       # flex pod1 test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -85,7 +104,26 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -110,7 +148,26 @@
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -170,7 +227,26 @@
           reinstall-olt: true
           enableMultiUni: true
           uniPortMask: '0x0003'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -197,7 +273,27 @@
           waitTimerForOltUp: 540
           VolthaEtcdPort: 9999
           time: '1'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
+
 
       # Menlo pod test job - master test job uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -223,7 +319,26 @@
           in-band-management: true
           waitTimerForOltUp: 540
           time: '4'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -405,7 +520,26 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           time: '16'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -431,7 +565,27 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           time: '1'
-          extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+          volthaHelmChartsChange: refs/changes/69/26569/11
+          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.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
+
 
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':