diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index f3f76e9..0662499 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -98,7 +98,11 @@
            HELM_FLAG="${extraHelmFlags} "
 
            if [ "${gerritProject}" = "voltha-go" ]; then
-             HELM_FLAG+="-f $WORKSPACE/voltha/voltha-system-tests/tests/data/ci-test.yaml "
+             HELM_FLAG+="--set images.rw_core.tag=citest,images.rw_core.pullPolicy=Never,images.ro_core.tag=citest,images.ro_core.pullPolicy=Never "
+           fi
+
+           if [ "${gerritProject}" = "ofagent-py" ]; then
+             HELM_FLAG+="--set images.ofagent.tag=citest,images.ofagent.pullPolicy=Never "
            fi
 
            if [ "${gerritProject}" = "voltha-openolt-adapter" ]; then
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 6b05b59..c8fed3a 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -157,7 +157,9 @@
 
             IMAGES=""
             if [ "${gerritProject}" = "voltha-go" ]; then
-                IMAGES="cli ofagent rw_core ro_core "
+                IMAGES="rw_core ro_core "
+            elif [ "${gerritProject}" = "ofagent-py" ]; then
+                IMAGES="ofagent "
             elif [ "${gerritProject}" = "voltha-openolt-adapter" ]; then
                 IMAGES="adapter_open_olt "
             elif [ "${gerritProject}" = "voltha-openonu-adapter" ]; then
diff --git a/jjb/verify/ofagent-py.yaml b/jjb/verify/ofagent-py.yaml
index 776661a..2a5ea78 100644
--- a/jjb/verify/ofagent-py.yaml
+++ b/jjb/verify/ofagent-py.yaml
@@ -18,6 +18,9 @@
       - 'tag-collision-reject'
       - 'make-unit-test':
           unit-test-keep-going: 'true'
+          junit-allow-empty-results: true
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-ofagent-py-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index a3f7f74..c40242d 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -32,7 +32,6 @@
           unit-test-targets: 'test'
           unit-test-keep-going: 'true'
       - 'voltha-patch-test':
-          buildImages: true
           pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 6a26897..fdafc85 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -319,7 +319,7 @@
                 approval-value: '+2'
           projects:
             - project-compare-type: REG_EXP
-              project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests)$'
+              project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py)$'
               branches:
                 - branch-compare-type: PLAIN
                   branch-pattern: 'master'