diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index ab2c061..3a45f68 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -51,12 +51,12 @@
           extraHelmFlags: >
             --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=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.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
@@ -245,12 +245,12 @@
           extraHelmFlags: >
             --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=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.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
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':