diff --git a/Makefile b/Makefile
index 15a66ee..af7a30a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for testing JJB jobs in a virtualenv
-
 .PHONY: test clean
 
+SHELL = bash -e -o pipefail
 VENV_DIR      ?= venv-jjb
 JJB_VERSION   ?= 3.2.0
 JOBCONFIG_DIR ?= job-configs
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index b8c1805..86668da 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -45,6 +45,43 @@
               teardown: false
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-bbsim-grpc'
+          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 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
+              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-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
@@ -199,6 +236,89 @@
           timeout: 180
 
       # openonu Go periodic tests
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-openonu-go-test-bbsim-grpc'
+          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 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: |
+            - 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'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 154de17..aeb7ce4 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -68,14 +68,14 @@
           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-api.default.svc:55555
+            --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-api.default.svc:55555
+            --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 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
+          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'