diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index 25fa598..42007aa 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -136,6 +136,7 @@
             sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.opencord.aaa
             sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.opencord.dhcpl2relay
           else
+            # config SADIS
             curl --fail -sSL --user karaf:karaf -X POST -H Content-Type:application/json "http://127.0.0.1:30120/onos/v1/network/configuration/apps/org.opencord.sadis" --data '{
               "sadis": {
                   "integration": {
@@ -158,6 +159,23 @@
                   }
               }
             }'
+
+            # config AAA
+            curl --fail -sSL --user karaf:karaf -X POST -H Content-Type:application/json "http://127.0.0.1:30120/onos/v1/network/configuration/apps/org.opencord.aaa" --data '{
+              "AAA": {
+                "radiusConnectionType" : "socket",
+                "radiusHost": "radius.default.svc.cluster.local",
+                "radiusServerPort": "1812",
+                "radiusSecret": "SECRET"
+              }
+            }'
+
+            # config DHCP
+            curl --fail -sSL --user karaf:karaf -X POST -H Content-Type:application/json "http://127.0.0.1:30120/onos/v1/network/configuration/apps/org.opencord.dhcpl2relay" --data '{
+              "dhcpl2relay" : {
+                "useOltUplinkForServerPktInOut": true
+              }
+            }'
           fi
         '''
       }
@@ -331,7 +349,7 @@
               for s in "${subs[@]}"
               do
                 IFS=/ read -r device port <<< $s
-                echo -e "\n Authenticating subscriber on device $device and port $port "
+                echo "Adding subscriber on device $device and port $port"
                 sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 volt-add-subscriber-access $device $port
               done
             fi
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 574adc7..3427aef 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -84,13 +84,17 @@
           expectedOnus: 64
           BBSIMdelay: 200
       - 'voltha-scale-measurements-periodic':
-          name: 'voltha-scale-measurements-periodic-1-1-200ms'
+          name: 'voltha-scale-measurements-periodic-1-1-200ms-complete'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           onuPerPon: 1
           ponPorts: 1
           expectedOnus: 1
           BBSIMdelay: 200
+          withOnosApps: true
+          flowStatInterval: 5
+          portsStatInterval: 5
+          expectedFlows: 2
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-2-OLTs-10-10-200ms'
           build-node: 'onf-pod1-head-node'
@@ -115,7 +119,7 @@
           bbsimAuth: false
           bbsimDhcp: false
       - 'voltha-scale-measurements-periodic':
-          name: 'voltha-scale-measurements-periodic-10-20-200ms-complete'
+          name: 'voltha-scale-measurements-periodic-4-16-200ms-complete'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           onuPerPon: 16
@@ -126,6 +130,18 @@
           flowStatInterval: 5
           portsStatInterval: 5
           expectedFlows: 65
+      - 'voltha-scale-measurements-periodic':
+          name: 'voltha-scale-measurements-periodic-10-20-200ms-complete'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          onuPerPon: 20
+          ponPorts: 10
+          expectedOnus: 64
+          BBSIMdelay: 200
+          withOnosApps: true
+          flowStatInterval: 5
+          portsStatInterval: 5
+          expectedFlows: 201
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-dev'
           build-node: 'voltha-scale'