diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index 00a2d59..c947e9b 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -23,7 +23,6 @@
           junit-allow-empty-results: true
           build-node: 'ubuntu16.04-basebuild-1c-2g'
       - 'voltha-patch-test':
-          buildImages: true
           pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 1cfea15..f7fa935 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -18,6 +18,8 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-go_licensed'
       - 'make-unit-test':
+          build-node: 'ubuntu16.04-basebuild-2c-4g'
+          build-timeout: 20
           dest-gopath: "github.com/opencord"
           name-extension: "-lint"
           unit-test-targets: 'lint'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index e8c8b7c..86092ac 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -19,6 +19,5 @@
           dependency-jobs: 'verify_voltha-helm-charts_tag-collision'
       - 'voltha-patch-test':
           build-timeout: 20
-          buildImages: false
           pipeline: 'voltha-bbsim-tests.groovy'
 
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 64be69c..1878259 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,8 +10,6 @@
           branch-regexp: '{all-branches-regexp}'
       - 'publish-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'voltha-openolt-adapter-system-tests':
-          branch-regexp: '{voltha-stablization-branch}'
 
 - job-group:
     name: 'verify-voltha-openolt-adapter-jobs'
@@ -32,6 +30,8 @@
           unit-test-targets: 'test'
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
+      - 'voltha-patch-test':
+          pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-openolt-adapter-jobs'
@@ -40,10 +40,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-- job-group:
-    name: 'voltha-openolt-adapter-system-tests'
-    jobs:
-      - 'voltha-patch-test':
-          buildImages: true
-          pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index e504dfa..903e2b6 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -10,8 +10,6 @@
           branch-regexp: '{all-branches-regexp}'
       - 'publish-voltha-openonu-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'voltha-openonu-adapter-system-tests':
-          branch-regexp: '{voltha-stablization-branch}'
 
 - job-group:
     name: 'verify-voltha-openonu-adapter-jobs'
@@ -24,6 +22,8 @@
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
           build-timeout: 15
+      - 'voltha-patch-test':
+          pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-openonu-adapter-jobs'
@@ -32,10 +32,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-- job-group:
-    name: 'voltha-openonu-adapter-system-tests'
-    jobs:
-      - 'voltha-patch-test':
-          buildImages: true
-          pipeline: 'voltha-bbsim-tests.groovy'