diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 8fa78d9..32c0ec9 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -117,6 +117,9 @@
 
            if [ "${gerritProject}" = "voltha-api-server" ]; then
              HELM_FLAG+="--set images.afrouter.tag=citest,images.afrouter.pullPolicy=Never,images.afrouterd.tag=citest,images.afrouterd.pullPolicy=Never"
+           else
+             # afrouter is disaggregated from the core, and lacks voltha-2.1 tags
+             HELM_FLAG+="--set images.afrouter.tag=master,images.afrouterd.tag=master "
            fi
 
            if [ "${gerritProject}" = "voltha-helm-charts" ]; then
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 34e39c9..71b1665 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -67,7 +67,7 @@
 
       - string:
           name: extraHelmFlags
-          default: '--set defaults.image_tag={default-image-tag},wpa_wait=10,dhcp_wait=10'
+          default: '--set defaults.image_tag={default-image-tag},images.afrouter.tag=master,images.afrouterd.tag=master,wpa_wait=10,dhcp_wait=10'
           description: 'Helm flags to pass to ./voltha up'
 
     project-type: pipeline
@@ -122,7 +122,7 @@
 
       - string:
           name: extraHelmFlags
-          default: '--set defaults.image_tag={default-image-tag}'
+          default: '--set defaults.image_tag={default-image-tag},images.afrouter.tag=master,images.afrouterd.tag=master'
           description: 'Helm flags to pass to ./voltha up'
 
     project-type: pipeline