diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index c958f8f..db2fc5c 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -211,9 +211,6 @@
 
           # Forward the ETCD port onto $VOLTHA_ETCD_PORT
           _TAG=etcd-port-forward kubectl -n \$INFRA_NS port-forward --address 0.0.0.0 -n default service/etcd $VOLTHA_ETCD_PORT:2379&
-
-          # NOTE this is temporary, for now the bbsim-sadis-server service will be overridden and ONOS will use the new server
-          kubectl apply -n infra -f $HOME/bbsim-sadis-server/deployments/bbsim-sadis-server.yaml
         '''
       }
     }
@@ -242,6 +239,11 @@
       steps {
         script {
           sh returnStdout: false, script: """
+
+          # NOTE this is temporary, for now the bbsim-sadis-server service will be overridden and ONOS will use the new server
+          helm del -n infra bbsim-sadis-server
+          kubectl apply -n infra -f $HOME/bbsim-sadis-server/deployments/bbsim-sadis-server.yaml
+
           # TODO this needs to be repeated per stack
           # kubectl exec \$(kubectl get pods | grep -E "bbsim[0-9]" | awk 'NR==1{print \$1}') -- bbsimctl log ${logLevel.toLowerCase()} false