diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 2c85e9e..2c783b4 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -21,8 +21,8 @@
           build-node: 'omec-ci'
           cp-context: 'dev-central-gcp'
           dp-context: 'dev-edge-onf-menlo'
-          central-config: 'gcp-dev'
-          edge-config: 'menlo-dev'
+          central-config: 'acc-gcp/app_values'
+          edge-config: 'ace-menlo/app_values'
       - 'omec-ng40-test':
           pod: 'dev'
           build-node: 'ng40-host-node'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index c1834fb..9da42b3 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -63,8 +63,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           withPcap: true
-          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final-aaa-meter'
-          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
+          bbsimImg: matteoscandolo/bbsim:flow-decomposition
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-tt-subscribers'
@@ -84,9 +84,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           withPcap: true
-          logLevel: INFO
-          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final-aaa-meter'
-          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
+          bbsimImg: matteoscandolo/bbsim:flow-decomposition
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-dt-subscribers'
@@ -105,8 +104,8 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
-          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final-aaa-meter'
-          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
+          bbsimImg: matteoscandolo/bbsim:flow-decomposition
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
       - 'voltha-scale-measurements':
@@ -126,9 +125,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           withPcap: true
-          logLevel: INFO
-          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final-aaa-meter'
-          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
+          bbsimImg: matteoscandolo/bbsim:flow-decomposition
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
@@ -147,8 +145,8 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
-          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final-aaa-meter'
-          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
+          bbsimImg: matteoscandolo/bbsim:flow-decomposition
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
 
       # voltha-2.5 Jobs
       - 'voltha-scale-measurements':
@@ -502,7 +500,7 @@
     kindVolthaChange: ''
     inMemoryEtcdStorage: true
     karafHome: 'apache-karaf-4.2.9'
-    logLevel: 'WARN'
+    logLevel: 'INFO'
 
     <<: *voltha-scale-job-parameters