diff --git a/jjb/make-unit.yaml b/jjb/make-unit.yaml
index ec3a530..9101df3 100644
--- a/jjb/make-unit.yaml
+++ b/jjb/make-unit.yaml
@@ -47,6 +47,7 @@
             DEST_GOPATH={dest-gopath}
             UNIT_TEST_TARGETS={unit-test-targets}
             UNIT_TEST_KEEP_GOING={unit-test-keep-going}
+            GOPROXY=https://proxy.golang.org
       - shell: !include-raw-escape: shell/make-unit.sh
 
     publishers:
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index d5c5aaa..4ef56b4 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -18,9 +18,10 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-bbsim_licensed'
       - 'make-unit-test':
-          unit-test-targets: 'test docker-build'
+          unit-test-targets: 'test'
           dest-gopath: "github.com/opencord"
           junit-allow-empty-results: true
+          build-node: 'ubuntu16.04-basebuild-1c-2g'
       - 'voltha-patch-test':
          pipeline: 'voltha-bbsim-tests.groovy'