diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index db2fc5c..4db9843 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -86,6 +86,9 @@
             helm repo add bbsim-sadis https://ciena.github.io/bbsim-sadis-server/charts
             helm repo update
 
+            # NOTE this is temporary, for now the bbsim-sadis-server service will be overridden and ONOS will use the new server
+            kubectl delete -n infra -f $HOME/bbsim-sadis-server/deployments/bbsim-sadis-server.yaml
+
             # removing ETCD port forward
             P_ID="\$(ps e -ww -A | grep "_TAG=etcd-port-forward" | grep -v grep | awk '{print \$1}')"
             if [ -n "\$P_ID" ]; then
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index ba193c1..b861ca6 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -101,9 +101,10 @@
           withEapol: false
           withDhcp: false
           withIgmp: false
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set defaults.image_pullPolicy=IfNotPresent'
+          extraHelmFlags: '--set use_openonu_adapter_go=true'
           volthaSystemTestsChange: refs/changes/27/21627/4
           kindVolthaChange: refs/changes/85/21485/13
+          openonuAdapterReplicas: 1
 
 
       # jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)