diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 479ac23..1d4abb9 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -192,8 +192,8 @@
           withDhcp: true
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
-#          onosImg: andreacampanella/voltha-onos:app-update-sadis
-          bbsimImg: matteoscandolo/bbsim:id-check
+          onosImg: andreacampanella/voltha-onos:olt-mac-integration
+#          bbsimImg: matteoscandolo/bbsim:id-check
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
@@ -210,8 +210,8 @@
           withDhcp: false
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
-#          onosImg: andreacampanella/voltha-onos:app-update-sadis
-          bbsimImg: matteoscandolo/bbsim:id-check
+          onosImg: andreacampanella/voltha-onos:olt-mac-integration
+#          bbsimImg: matteoscandolo/bbsim:id-check
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
@@ -230,8 +230,8 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
-#          onosImg: andreacampanella/voltha-onos:app-update-sadis
-          bbsimImg: matteoscandolo/bbsim:id-check
+          onosImg: andreacampanella/voltha-onos:olt-mac-integration
+#          bbsimImg: matteoscandolo/bbsim:id-check
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -252,7 +252,7 @@
           withEapol: true
           withDhcp: true
           withIgmp: false
-#          onosImg: andreacampanella/voltha-onos:app-update-sadis
+          onosImg: andreacampanella/voltha-onos:olt-mac-integration
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-dt-subscribers'
@@ -272,7 +272,7 @@
           withEapol: false
           withDhcp: false
           withIgmp: false
-#          onosImg: andreacampanella/voltha-onos:app-update-sadis
+          onosImg: andreacampanella/voltha-onos:olt-mac-integration
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-tt-subscribers'
@@ -292,7 +292,7 @@
           withEapol: false
           withDhcp: true
           withIgmp: true
-#          onosImg: andreacampanella/voltha-onos:app-update-sadis
+          onosImg: andreacampanella/voltha-onos:olt-mac-integration
 
       # voltha-2.6 Jobs
       - 'voltha-scale-measurements':