diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 2ad8f2c..87e8b70 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -456,7 +456,7 @@
       sh '''
         mkdir $WORKSPACE/etcd-metrics
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_debugging_mvcc_keys_total' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-key-count.json
-        curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=grpc_server_handled_total{grpc_code="OK",grpc_service="etcdserverpb.KV"}' | jq . > $WORKSPACE/etcd-metrics/etcd-rpc-count.json
+        curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=grpc_server_handled_total{grpc_service="etcdserverpb.KV"}' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-rpc-count.json
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_debugging_mvcc_db_total_size_in_bytes' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-db-size.json
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_disk_backend_commit_duration_seconds_sum' | jq '.data'  > $WORKSPACE/etcd-metrics/etcd-backend-write-time.json
       '''
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 142573c..4afaaa2 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -113,6 +113,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi '
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-1-16-32-att-flows'
@@ -132,6 +133,7 @@
           extraHelmFlags: '--set auth=false --set limits.memory=8192Mi '
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-1-16-32-att-subscribers'
@@ -151,6 +153,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi --set defaults.rw_core.timeout=30s'
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
       - 'voltha-scale-measurements':
@@ -172,6 +175,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi '
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
       - 'voltha-scale-measurements':
@@ -193,6 +197,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi '
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       - 'voltha-scale-measurements':
           disabled: true
@@ -213,6 +218,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi --set auth=false '
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       - 'voltha-scale-measurements':
           disabled: true
@@ -233,6 +239,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi --set defaults.rw_core.timeout=30s'
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
       - 'voltha-scale-measurements':
@@ -254,6 +261,7 @@
           extraHelmFlags: '--set limits.memory=8192Mi --set defaults.rw_core.timeout=30s'
           openonuAdapterImg: matteoscandolo/voltha-openonu-adapter:adopt-retry
           rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:flow-remove-log
 
       # development pipeline
       - 'voltha-scale-measurements-dev':