diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 233fa7e..30ad472 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -47,16 +47,17 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-bbsim-grpc'
           code-branch: 'master'
-          volthaHelmChartsChange: refs/changes/69/26569/7
+          volthaHelmChartsChange: refs/changes/69/26569/8
+          volthaSystemTestsChange: refs/changes/58/27458/1
           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=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.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
@@ -241,16 +242,17 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim-grpc'
           code-branch: 'master'
-          volthaHelmChartsChange: refs/changes/69/26569/7
+          volthaHelmChartsChange: refs/changes/69/26569/9
+          volthaSystemTestsChange: refs/changes/32/27532/1
           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=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.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
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index ce66cd0..8ef5939 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -68,17 +68,18 @@
           inMemoryEtcdStorage: false
           extraHelmFlags: >
             --set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha1-voltha-adapter-openolt-api.default.svc:50060
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha1-voltha-adapter-openonu-api.default.svc:50060
+            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.default.svc:55558
+            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.default.svc:50060
+            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.default.svc:55558
+            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.default.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.tracing.enabled=true
-          volthaHelmChartsChange: refs/changes/69/26569/7
-          rwCoreImg: 'dbainbriciena/voltha-rw-core:grpc009'
-          openoltAdapterImg: 'dbainbriciena/voltha-openolt-adapter:grpc009'
-          openonuAdapterGoImg: 'dbainbriciena/voltha-openonu-adapter-go:grpc009'
+          volthaHelmChartsChange: refs/changes/69/26569/8
+          rwCoreImg: 'volthacore/voltha-rw-core:grpc_v1'
+          openoltAdapterImg: 'volthacore/voltha-openolt-adapter:grpc_v1'
+          openonuAdapterGoImg: 'volthacore/voltha-openonu-adapter-go:grpc_v1'
+          onosImg: andreacampanella/voltha-onos:port-remove
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers-grpc'
           'disable-job': false
@@ -98,17 +99,18 @@
           inMemoryEtcdStorage: false
           extraHelmFlags: >
             -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha1-voltha-api.default.svc:55555
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha1-voltha-adapter-openolt-api.default.svc:50060
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha1-voltha-api.default.svc:55555
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha1-voltha-adapter-openonu-api.default.svc:50060
+            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.default.svc:55558
+            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.default.svc:50060
+            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.default.svc:55558
+            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.default.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.tracing.enabled=true
-          volthaHelmChartsChange: refs/changes/69/26569/3
-          rwCoreImg: 'dbainbriciena/voltha-rw-core:grpc009'
-          openoltAdapterImg: 'dbainbriciena/voltha-openolt-adapter:grpc009'
-          openonuAdapterGoImg: 'dbainbriciena/voltha-openonu-adapter-go:grpc009'
+          volthaHelmChartsChange: refs/changes/69/26569/8
+          rwCoreImg: 'volthacore/voltha-rw-core:grpc_v1'
+          openoltAdapterImg: 'volthacore/voltha-openolt-adapter:grpc_v1'
+          openonuAdapterGoImg: 'volthacore/voltha-openonu-adapter-go:grpc_v1'
+          onosImg: andreacampanella/voltha-onos:port-remove
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-grpc'
           'disable-job': false
@@ -128,17 +130,18 @@
           inMemoryEtcdStorage: false
           extraHelmFlags: >
             --set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha1-voltha-api.default.svc:55555
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha1-voltha-adapter-openolt-api.default.svc:50060
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha1-voltha-api.default.svc:55555
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha1-voltha-adapter-openonu-api.default.svc:50060
+            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.default.svc:55558
+            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.default.svc:50060
+            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.default.svc:55558
+            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.default.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.tracing.enabled=true
-          volthaHelmChartsChange: refs/changes/69/26569/3
-          rwCoreImg: 'dbainbriciena/voltha-rw-core:grpc009'
-          openoltAdapterImg: 'dbainbriciena/voltha-openolt-adapter:grpc009'
-          openonuAdapterGoImg: 'dbainbriciena/voltha-openonu-adapter-go:grpc009'
+          volthaHelmChartsChange: refs/changes/69/26569/8
+          rwCoreImg: 'volthacore/voltha-rw-core:grpc_v1'
+          openoltAdapterImg: 'volthacore/voltha-openolt-adapter:grpc_v1'
+          openonuAdapterGoImg: 'volthacore/voltha-openonu-adapter-go:grpc_v1'
+          onosImg: andreacampanella/voltha-onos:port-remove
 
       # OLT app rewrite jobs
       - 'voltha-scale-measurements':