Trending: Implement the latest changes in job specs

Graphs:
 - MRR
   - 2n-clx
   - 2n-skx
   - 3n-skx
   - 3n-hsw
   - 3n-tsh
 - NDRPDR
   - 2n-skx
   - 3n-skx
   - 3n-hsw
   - 2n-clx

Change-Id: Ieab26ba1d2ee56e66c5c8598c4dba240a14e53e9
Signed-off-by: Tibor Frank <tifrank@cisco.com>

76 files changed, 1334 insertions, 2397 deletions

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 20685d972a..fff9a5ccd1 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -47,9 +47,10 @@ analysis and anomaly detection methodology.
     ndrpdr_trending/ip6
     ndrpdr_trending/srv6
     ndrpdr_trending/ip4_tunnels
-    ndrpdr_trending/ip6_tunnels
     ndrpdr_trending/vhost
     ndrpdr_trending/container_memif
+    ndrpdr_trending/ipsec
+    ndrpdr_trending/vts
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-cx556a.rst
index 5e1d40653c..43353c1729 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-cx556a.rst
@@ -1,7 +1,7 @@
-2n-clx-x710
------------
+2n-clx-cx556a
+-------------
 
-64b-memif-base-dpdk
+64b-memif-base-rdma
 ```````````````````
 
 2t1c-ndr
@@ -9,12 +9,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-memif-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,11 +23,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-memif-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst
index b1387763b4..88513774be 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst
@@ -1,6 +1,37 @@
 2n-clx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst
index 0d374367f2..0aeb221564 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst
@@ -1,6 +1,37 @@
 2n-skx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst
index c9e4afc46b..82b7922332 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst
@@ -1,6 +1,37 @@
 3n-skx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/container_memif.rst b/docs/cpta/ndrpdr_trending/container_memif.rst
index bcdc140447..096f02d535 100644
--- a/docs/cpta/ndrpdr_trending/container_memif.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif.rst
@@ -3,12 +3,7 @@ LXC/DRC Container Memif
 
 .. toctree::
 
+    container_memif-2n-clx-xxv710
+    container_memif-2n-clx-cx556a
     container_memif-2n-skx-xxv710
-    container_memif-2n-skx-x710
     container_memif-3n-skx-xxv710
-    container_memif-3n-skx-x710
-    container_memif-2n-clx-xxv710
-    container_memif-2n-clx-x710
-    container_memif-3n-hsw-xl710
-    container_memif-3n-hsw-x710
-    container_memif-3n-hsw-x520
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-cx556a.rst
index be5a1fe655..1a0e372b11 100644
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-cx556a.rst
@@ -1,95 +1,95 @@
-3n-hsw-x710
------------
+2n-clx-cx556a
+-------------
 
-64b-l2switching-base-dpdk
-`````````````````````````
+64b-ip4routing-base-rdma
+````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-ip4-base-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-ip4-base-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
+64b-ip4routing-scale-rdma
+`````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-scale-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-scale-pdr"></a>
+    <a name="64b-2t1c-base-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-l2switching-l2-features-iacl1-dpdk
-``````````````````````````````````````
+64b-ip4routing-features-rdma
+````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-features-iacl1-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-ip4-features-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-features-iacl1-pdr"></a>
+    <a name="64b-2t1c-base-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-ip4-features-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst
index c98fa26e9d..bfb1d8a980 100644
--- a/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst
@@ -33,65 +33,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
-
-64b-ip4routing-scale-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
index 0e0f9e512a..48de927bb9 100644
--- a/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-clx-xxv710
 -------------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-scale-avf
+`````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,29 +25,92 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-scale-dpdk
-`````````````````````````
+64b-ip4routing-scale-avf-rnd
+````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-scale-avf-rnd-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-avf-rnd-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-features-avf
+```````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-base-scale-dpdk
+``````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,12 +119,44 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-scale-dpdk-rnd
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-rnd-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-rnd-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -78,7 +173,7 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -92,6 +187,6 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst
index fcc08917c5..64060fed8b 100644
--- a/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -11,11 +11,13 @@
 
     <a name="64b-2t1c-base-avf-ndr"></a>
     <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
+    <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -26,72 +28,12 @@
 
     <a name="64b-2t1c-base-avf-pdr"></a>
     <a name="64b-2t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-scale-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst
index 30e6ae06bc..dc212bf542 100644
--- a/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-skx-xxv710
 -------------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,11 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,29 +24,28 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-scale-dpdk
-`````````````````````````
+64b-ip4routing-scale-avf
+````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-scale-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,29 +54,61 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-scale-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-features-avf
+```````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-features-dpdk
-````````````````````````````
+64b-ip4routing-base-features-dpdk
+`````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-features-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -87,11 +117,43 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-features-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-scale-dpdk
+`````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x520.rst
deleted file mode 100644
index fcea2e7575..0000000000
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x520.rst
+++ /dev/null
@@ -1,283 +0,0 @@
-3n-hsw-x520
------------
-
-64b-ip4routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <a name="64b-1t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <a name="64b-1t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-iacl1-dpdk
-``````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-iacl10-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-iacl50-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-oacl1-dpdk
-``````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-oacl10-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-oacl50-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-udp-dpdk
-````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
deleted file mode 100644
index 25e29f9056..0000000000
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-3n-hsw-x710
------------
-
-64b-ip4routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <a name="64b-1t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <a name="64b-1t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-udp-dpdk
-````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-
-
diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst
index 57e0dd67ec..b4f42040de 100644
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst
@@ -1,8 +1,8 @@
 3n-hsw-xl710
 ------------
 
-64b-ip4routing-base-dpdk
-````````````````````````
+64b-ip4routing-base-scale-dpdk
+``````````````````````````````
 
 1t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-1t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,10 +25,11 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-1t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst
index 515c0ece16..a60c38bc6d 100644
--- a/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst
@@ -1,8 +1,8 @@
 3n-skx-x710
 -----------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,73 +25,11 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-scale-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst
index f2179252e6..b0d961174b 100644
--- a/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst
@@ -1,8 +1,8 @@
 3n-skx-xxv710
 -------------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,29 +25,30 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-scale-dpdk
-`````````````````````````
+64b-ip4routing-base-dpdk
+````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,42 +57,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-dpdk-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4.rst b/docs/cpta/ndrpdr_trending/ip4.rst
index c10e62706f..4ba4dc8fb2 100644
--- a/docs/cpta/ndrpdr_trending/ip4.rst
+++ b/docs/cpta/ndrpdr_trending/ip4.rst
@@ -3,12 +3,11 @@ IPv4 Routing
 
 .. toctree::
 
+    ip4-2n-clx-xxv710
+    ip4-2n-clx-x710
+    ip4-2n-clx-cx556a
     ip4-2n-skx-xxv710
     ip4-2n-skx-x710
     ip4-3n-skx-xxv710
     ip4-3n-skx-x710
-    ip4-2n-clx-xxv710
-    ip4-2n-clx-x710
     ip4-3n-hsw-xl710
-    ip4-3n-hsw-x710
-    ip4-3n-hsw-x520
diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x710.rst
deleted file mode 100644
index aa5866fd89..0000000000
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x710.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-3n-hsw-x710
------------
-
-64b-ip4tunnel-dot1q-base-scale-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-dot1q-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-dot1q-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4tunnel-eth-base-scale-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-eth-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-eth-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-xl710.rst
index a94056c361..b5a5b6399f 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-xl710.rst
@@ -1,20 +1,20 @@
 3n-hsw-xl710
 ------------
 
-64b-memif-base-dpdk
-```````````````````
+64b-ip4tunnel-eth-base-dpdk
+```````````````````````````
 
 1t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-1t1c-eth-base-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,11 +23,11 @@
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-1t1c-eth-base-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-xxv710.rst
index e4f000f864..f4022e021f 100644
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-xxv710.rst
@@ -1,20 +1,20 @@
-3n-skx-x710
------------
+3n-skx-xxv710
+-------------
 
-64b-ip4tunnel-dot1q-base-scale-dpdk
-```````````````````````````````````
+64b-ip4tunnel-base-avf
+``````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-dot1q-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,29 +23,29 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-dot1q-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4tunnel-eth-base-scale-dpdk
-`````````````````````````````````
+64b-ip4tunnel-base-dpdk
+```````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-eth-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +54,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-eth-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels.rst
index d847bef4ff..0a644b04ab 100644
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels.rst
+++ b/docs/cpta/ndrpdr_trending/ip4_tunnels.rst
@@ -3,6 +3,5 @@ IPv4 Tunnels
 
 .. toctree::
 
-    ip4_tunnels-3n-skx-x710
-    ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-hsw-x520
+    ip4_tunnels-3n-skx-xxv710
+    ip4_tunnels-3n-hsw-xl710
diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
index 8264e02603..941281a402 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x520.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
@@ -1,33 +1,35 @@
-3n-hsw-x520
------------
+2n-clx-cx556a
+-------------
 
-64b-memif-base-dpdk
-```````````````````
+78b-ip6routing-base-scale-rdma
+``````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="78b-2t1c-base-rdma-ndr"></a>
+    <a name="78b-2t1c-scale-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="78b-2t1c-base-rdma-pdr"></a>
+    <a name="78b-2t1c-scale-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst
index a2177d5314..16d96b556d 100644
--- a/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst
@@ -1,53 +1,23 @@
 2n-clx-x710
 -----------
 
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
+78b-ip6routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
     <a name="78b-2t1c-base-dpdk-ndr"></a>
-    <a name="78b-2t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-base-dpdk-pdr"></a>
-    <a name="78b-2t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
     <a name="78b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,11 +26,14 @@
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
+    <a name="78b-2t1c-base-dpdk-pdr"></a>
     <a name="78b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst
index b0915df6bb..b11d85921b 100644
--- a/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst
@@ -1,6 +1,39 @@
 2n-clx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst
index 3c2a8262da..074109f737 100644
--- a/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst
@@ -1,16 +1,18 @@
 2n-skx-x710
 -----------
 
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
+78b-ip6routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
     <a name="78b-2t1c-base-dpdk-ndr"></a>
-    <a name="78b-2t1c-features-dpdk-ndr"></a>
+    <a name="78b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -24,43 +26,14 @@
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
     <a name="78b-2t1c-base-dpdk-pdr"></a>
-    <a name="78b-2t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
     <a name="78b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst
index b57977964b..68a6a20efb 100644
--- a/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst
@@ -1,6 +1,39 @@
 2n-skx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x520.rst
deleted file mode 100644
index 2aa172e0e5..0000000000
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x520.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-3n-hsw-x520
------------
-
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-ndr"></a>
-    <a name="78b-1t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-pdr"></a>
-    <a name="78b-1t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x710.rst
deleted file mode 100644
index 466f607e82..0000000000
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x710.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-3n-hsw-x710
------------
-
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-ndr"></a>
-    <a name="78b-1t1c-features-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-pdr"></a>
-    <a name="78b-1t1c-features-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
index 754ee7d37e..f4dc91ba95 100644
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
@@ -1,8 +1,8 @@
 3n-hsw-xl710
 ------------
 
-78b-ip6routing-base-dpdk
-````````````````````````
+78b-ip6routing-base-scale-dpdk
+``````````````````````````````
 
 1t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="78b-1t1c-base-dpdk-ndr"></a>
+    <a name="78b-1t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,10 +25,11 @@
 .. raw:: html
 
     <a name="78b-1t1c-base-dpdk-pdr"></a>
+    <a name="78b-1t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst
index 75ce02a3af..6ef374cb30 100644
--- a/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst
@@ -1,21 +1,21 @@
 3n-skx-x710
 -----------
 
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
+78b-ip6routing-base-scale-avf
+`````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="78b-2t1c-base-dpdk-ndr"></a>
-    <a name="78b-2t1c-features-dpdk-ndr"></a>
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,43 +24,12 @@
 
 .. raw:: html
 
-    <a name="78b-2t1c-base-dpdk-pdr"></a>
-    <a name="78b-2t1c-features-dpdk-pdr"></a>
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-scale-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst
index 64d1312ed2..0e2499cb12 100644
--- a/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst
@@ -1,6 +1,39 @@
 3n-skx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/ip6.rst b/docs/cpta/ndrpdr_trending/ip6.rst
index be519dfdf2..95cf93112f 100644
--- a/docs/cpta/ndrpdr_trending/ip6.rst
+++ b/docs/cpta/ndrpdr_trending/ip6.rst
@@ -3,12 +3,10 @@ IPv6 Routing
 
 .. toctree::
 
+    ip6-2n-clx-xxv710
+    ip6-2n-clx-x710
+    ip6-2n-clx-cx556a
     ip6-2n-skx-xxv710
     ip6-2n-skx-x710
     ip6-3n-skx-xxv710
-    ip6-3n-skx-x710
     ip6-3n-hsw-xl710
-    ip6-3n-hsw-x710
-    ip6-3n-hsw-x520
-    ip6-2n-clx-xxv710
-    ip6-2n-clx-x710
diff --git a/docs/cpta/ndrpdr_trending/ip6_tunnels-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip6_tunnels-3n-hsw-x520.rst
deleted file mode 100644
index 685f03f46b..0000000000
--- a/docs/cpta/ndrpdr_trending/ip6_tunnels-3n-hsw-x520.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-3n-hsw-x520
------------
-
-78b-ip6tunnel-eth-base-dpdk
-```````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-eth-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-eth-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/ip6_tunnels.rst b/docs/cpta/ndrpdr_trending/ip6_tunnels.rst
deleted file mode 100644
index d7ef850756..0000000000
--- a/docs/cpta/ndrpdr_trending/ip6_tunnels.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-IPv6 Tunnels
-============
-
-.. toctree::
-
-    ip6_tunnels-3n-hsw-x520
diff --git a/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..555cf66881
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
@@ -0,0 +1,68 @@
+3n-hsw-xl710
+------------
+
+imix-ipsec-ip4routing-base-scale-sw-dpdk
+````````````````````````````````````````
+
+1t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-sw-dpdk-ndr"></a>
+    <a name="imix-1t1c-scale-sw-dpdk-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-sw-dpdk-pdr"></a>
+    <a name="imix-1t1c-scale-sw-dpdk-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+imix-ipsec-ip4routing-base-scale-hw-dpdk
+````````````````````````````````````````
+
+1t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-hw-dpdk-ndr"></a>
+    <a name="imix-1t1c-scale-hw-dpdk-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-hw-dpdk-pdr"></a>
+    <a name="imix-1t1c-scale-hw-dpdk-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..8c13b3a657
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
@@ -0,0 +1,134 @@
+3n-skx-xxv710
+-------------
+
+imix-ipsec-ip4routing-base-scale-sw-avf
+```````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-avf-ndr"></a>
+    <a name="imix-2t1c-scale-sw-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-avf-pdr"></a>
+    <a name="imix-2t1c-scale-sw-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+imix-ipsec-ip4routing-base-scale-sw-dpdk
+````````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-dpdk-ndr"></a>
+    <a name="imix-2t1c-scale-sw-dpdk-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-dpdk-pdr"></a>
+    <a name="imix-2t1c-scale-sw-dpdk-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-avf
+````````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-avf-ndr"></a>
+    <a name="1518b-2t1c-scale-sw-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-avf-pdr"></a>
+    <a name="1518b-2t1c-scale-sw-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-dpdk
+`````````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-dpdk-ndr"></a>
+    <a name="1518b-2t1c-scale-sw-dpdk-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-dpdk-pdr"></a>
+    <a name="1518b-2t1c-scale-sw-dpdk-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/ndrpdr_trending/ipsec.rst b/docs/cpta/ndrpdr_trending/ipsec.rst
new file mode 100644
index 0000000000..31328aff60
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/ipsec.rst
@@ -0,0 +1,7 @@
+IPSec IPv4 Routing
+==================
+
+.. toctree::
+
+    ipsec-3n-skx-xxv710
+    ipsec-3n-hsw-xl710
diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/l2-2n-clx-cx556a.rst
index ddb8208fc9..d5242e6d8d 100644
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x520.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-clx-cx556a.rst
@@ -1,64 +1,64 @@
-3n-hsw-x520
------------
+2n-clx-cx556a
+-------------
 
-64b-ip4tunnel-dot1q-base-scale-dpdk
-```````````````````````````````````
+64b-l2switching-base-rdma
+`````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-dot1q-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-l2-base-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-dot1q-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-l2-base-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4tunnel-eth-base-scale-dpdk
-`````````````````````````````````
+64b-l2switching-base-scale-rdma
+```````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-eth-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-rdma-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-eth-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-rdma-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst
index 5c72f512ed..a6a6fe4594 100644
--- a/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst
@@ -1,8 +1,8 @@
 2n-clx-x710
 -----------
 
-64b-l2switching-base-avf
-````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,73 +10,14 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-avf-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <a name="64b-2t1c-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -85,11 +26,14 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst
index 8c78418623..cce010da34 100644
--- a/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst
@@ -32,20 +32,20 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-dpdk
-`````````````````````````
+64b-l2switching-base-scale-avf
+```````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,12 +54,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +71,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +86,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
diff --git a/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst b/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst
index ad34eebd60..a126ba8f0a 100644
--- a/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-l2switching-base-avf
-````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-avf-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,42 +25,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +42,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +57,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
diff --git a/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst
index bb50da9752..9ffa7d63a3 100644
--- a/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst
@@ -63,6 +63,37 @@
     <p><br></p>
     </center>
 
+64b-l2switching-base-scale-avf
+``````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-l2switching-base-scale-dpdk
 ```````````````````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1227.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1227.rst
deleted file mode 100644
index c8853b73fb..0000000000
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1227.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-3n-hsw-vic1227
---------------
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1385.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1385.rst
deleted file mode 100644
index 7f204d545f..0000000000
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1385.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-3n-hsw-vic1385
---------------
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-x520.rst
deleted file mode 100644
index e17418070d..0000000000
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x520.rst
+++ /dev/null
@@ -1,343 +0,0 @@
-3n-hsw-x520
------------
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-iacl1-dpdk
-``````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-iacl10-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-iacl50-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-oacl1-dpdk
-``````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-oacl10-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-oacl50-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-macip-iacl1-dpdk
-````````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl1-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl1-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-macip-iacl10-dpdk
-`````````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl10-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl10-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-macip-iacl50-dpdk
-`````````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl50-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl50-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst
index 2451bc77d8..e412903c42 100644
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst
@@ -1,8 +1,8 @@
 3n-hsw-xl710
 ------------
 
-64b-l2switching-base-dpdk
-`````````````````````````
+64b-l2switching-base-scale-dpdk
+```````````````````````````````
 
 1t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-1t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,10 +25,11 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-1t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst
index 229eee7184..e352701925 100644
--- a/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst
@@ -1,8 +1,8 @@
 3n-skx-x710
 -----------
 
-64b-l2switching-base-avf
-````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-avf-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,42 +25,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +42,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +57,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
diff --git a/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst
index 3c175f5871..9e917676eb 100644
--- a/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst
@@ -32,7 +32,7 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-dpdk
+64b-l2switching-scale-avf
 `````````````````````````
 
 2t1c-ndr
@@ -40,12 +40,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,12 +54,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +71,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +86,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:
diff --git a/docs/cpta/ndrpdr_trending/l2.rst b/docs/cpta/ndrpdr_trending/l2.rst
index d2c0e05f62..3b67542fea 100644
--- a/docs/cpta/ndrpdr_trending/l2.rst
+++ b/docs/cpta/ndrpdr_trending/l2.rst
@@ -3,14 +3,11 @@ L2 Ethernet Switching
 
 .. toctree::
 
+    l2-2n-clx-xxv710
+    l2-2n-clx-x710
+    l2-2n-clx-cx556a
     l2-2n-skx-xxv710
     l2-2n-skx-x710
     l2-3n-skx-xxv710
     l2-3n-skx-x710
     l2-3n-hsw-xl710
-    l2-3n-hsw-x710
-    l2-3n-hsw-x520
-    l2-3n-hsw-vic1227
-    l2-3n-hsw-vic1385
-    l2-2n-clx-xxv710
-    l2-2n-clx-x710
diff --git a/docs/cpta/ndrpdr_trending/srv6-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/srv6-3n-hsw-xl710.rst
index 7899b1c107..e3c8528c42 100644
--- a/docs/cpta/ndrpdr_trending/srv6-3n-hsw-x520.rst
+++ b/docs/cpta/ndrpdr_trending/srv6-3n-hsw-xl710.rst
@@ -1,5 +1,5 @@
-3n-hsw-x520
------------
+3n-hsw-xl710
+------------
 
 78b-srv6-ip6routing-base-dpdk
 `````````````````````````````
@@ -13,8 +13,8 @@
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-srv6-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -27,7 +27,7 @@
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-srv6-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/srv6-3n-skx-xxv710.rst
index d2aad2e4af..53ad259423 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x710.rst
+++ b/docs/cpta/ndrpdr_trending/srv6-3n-skx-xxv710.rst
@@ -1,33 +1,33 @@
-3n-hsw-x710
------------
+3n-skx-xxv710
+-------------
 
-64b-memif-base-dpdk
-```````````````````
+78b-srv6-ip6routing-base-avf
+````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="78b-1t1c-base-avf-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="78b-1t1c-base-avf-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/srv6.rst b/docs/cpta/ndrpdr_trending/srv6.rst
index f3174498a8..3bfb4b53df 100644
--- a/docs/cpta/ndrpdr_trending/srv6.rst
+++ b/docs/cpta/ndrpdr_trending/srv6.rst
@@ -3,4 +3,5 @@ SRv6 Routing
 
 .. toctree::
 
-    srv6-3n-hsw-x520
+    srv6-3n-skx-xxv710
+    srv6-3n-hsw-xl710
diff --git a/docs/cpta/ndrpdr_trending/vhost-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/vhost-2n-clx-cx556a.rst
index fbf679f38b..8127d69272 100644
--- a/docs/cpta/ndrpdr_trending/vhost-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-2n-clx-cx556a.rst
@@ -1,7 +1,7 @@
-2n-clx-x710
------------
+2n-clx-cx556a
+-------------
 
-64b-vhost-base-dpdk-testpmd
+64b-vhost-base-rdma-testpmd
 ```````````````````````````
 
 2t1c-ndr
@@ -9,12 +9,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
+    <a name="64b-2t1c-base-rdma-testpmd-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,16 +23,16 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
+    <a name="64b-2t1c-base-rdma-testpmd-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
+64b-vhost-base-rdma-vpp
 ```````````````````````
 
 2t1c-ndr
@@ -40,12 +40,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-ndr"></a>
+    <a name="64b-2t1c-base-rdma-vpp-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +54,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-pdr"></a>
+    <a name="64b-2t1c-base-rdma-vpp-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst
index 4fcbac4722..bdaa7147dc 100644
--- a/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst
@@ -1,20 +1,21 @@
 2n-clx-xxv710
 -------------
 
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
+64b-vhost-base-avf-dpdk-testpmd
+```````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-testpmd-ndr"></a>
     <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,29 +24,31 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-testpmd-pdr"></a>
     <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
-```````````````````````
+64b-vhost-base-avf-dpdk-vpp
+```````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-vpp-ndr"></a>
     <a name="64b-2t1c-base-dpdk-vpp-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +57,12 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-vpp-pdr"></a>
     <a name="64b-2t1c-base-dpdk-vpp-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst
index ed78cb394b..a109c4e9f3 100644
--- a/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst
@@ -1,6 +1,68 @@
 2n-skx-xxv710
 -------------
 
+64b-vhost-base-avf-testpmd
+``````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-testpmd-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-testpmd-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-avf-vpp
+``````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-vhost-base-dpdk-testpmd
 ```````````````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x520.rst
deleted file mode 100644
index 4a2a33ac53..0000000000
--- a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x520.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-3n-hsw-x520
------------
-
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-link-bonding-vhost-base-dpdk-vpp
-````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x710.rst
deleted file mode 100644
index 4d454631cf..0000000000
--- a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x710.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-3n-hsw-x710
------------
-
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-link-bonding-vhost-base-dpdk-vpp
-````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst
index 9812bf9a53..456ae66628 100644
--- a/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst
@@ -1,20 +1,20 @@
 3n-skx-x710
 -----------
 
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
+64b-link-bonding-vhost-base-avf-testpmd
+```````````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-testpmd-ndr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,16 +23,16 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-testpmd-pdr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-link-bonding-vhost-base-dpdk-vpp
+64b-link-bonding-vhost-base-avf-vpp
 ````````````````````````````````````
 
 2t1c-ndr
@@ -40,12 +40,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-vpp-ndr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,73 +54,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-vpp-pdr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-vpp-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-vpp-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst
index 226d9582d8..9c12dda9f1 100644
--- a/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst
@@ -1,20 +1,20 @@
 3n-skx-xxv710
 -------------
 
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
+64b-link-bonding-vhost-base-avf-testpmd
+```````````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,29 +23,60 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-pdr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-avf-vpp
+````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
-```````````````````````
+64b-vhost-base-avf-testpmd
+``````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-ndr"></a>
+    <a name="64b-2t1c-base-avf-testpmd-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +85,73 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-pdr"></a>
+    <a name="64b-2t1c-base-avf-testpmd-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-avf-vpp
+``````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-dpdk-testpmd
+```````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/vhost.rst b/docs/cpta/ndrpdr_trending/vhost.rst
index f197eda654..1d39dd9219 100644
--- a/docs/cpta/ndrpdr_trending/vhost.rst
+++ b/docs/cpta/ndrpdr_trending/vhost.rst
@@ -3,12 +3,9 @@ VMs vhost-user
 
 .. toctree::
 
+    vhost-2n-clx-xxv710
+    vhost-2n-clx-cx556a
     vhost-2n-skx-xxv710
-    vhost-2n-skx-x710
     vhost-3n-skx-xxv710
     vhost-3n-skx-x710
     vhost-3n-hsw-xl710
-    vhost-3n-hsw-x710
-    vhost-3n-hsw-x520
-    vhost-2n-clx-xxv710
-    vhost-2n-clx-x710
diff --git a/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..1978958668
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst
@@ -0,0 +1,34 @@
+2n-clx-xxv710
+-------------
+
+114b-vts-l2switching-base-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="114b-2t1c-base-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="114b-2t1c-base-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/ndrpdr_trending/vts.rst b/docs/cpta/ndrpdr_trending/vts.rst
new file mode 100644
index 0000000000..5b7cd10514
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/vts.rst
@@ -0,0 +1,6 @@
+Virtual Topology System
+=======================
+
+.. toctree::
+
+    vts-2n-clx-xxv710
diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index 17784c46c6..43e5e9db7f 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -3,8 +3,8 @@ LXC/DRC Container Memif
 
 .. toctree::
 
+    container_memif-2n-clx-xxv710
+    container_memif-2n-clx-cx556a
     container_memif-2n-skx-xxv710
     container_memif-3n-skx-xxv710
     container_memif-3n-tsh-x520
-    container_memif-2n-clx-xxv710
-    container_memif-2n-clx-cx556a
diff --git a/docs/cpta/trending/ip4-2n-clx-xxv710.rst b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
index c7b4af245b..fdb6830f0a 100644
--- a/docs/cpta/trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-clx-xxv710
 -------------
 
-64b-ip4routing-base-avf
-```````````````````````
+64b-ip4routing-base-avf-dpdk
+````````````````````````````
 
 2t1c
 ::::
@@ -10,6 +10,7 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -24,6 +25,7 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -38,56 +40,12 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-dpdk
-````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-base-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-base-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
     <a name="64b-8t4c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -180,48 +138,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
-
-64b-features-ip4routing-base-dpdk
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710.rst b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
index fb1680ff73..85cf460e40 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
@@ -97,98 +97,99 @@
     <p><br></p>
     </center>
 
-64b-features-ip4routing-base-avf
-````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-avf"></a>
-    <a name="64b-2t1c-features-iacl50-avf"></a>
-    <a name="64b-2t1c-features-oacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-avf"></a>
-    <a name="64b-4t2c-features-iacl50-avf"></a>
-    <a name="64b-4t2c-features-oacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-avf"></a>
-    <a name="64b-8t4c-features-iacl50-avf"></a>
-    <a name="64b-8t4c-features-oacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-features-ip4routing-base-dpdk
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
+..
+    64b-features-ip4routing-base-avf
+    ````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-features-avf"></a>
+        <a name="64b-2t1c-features-iacl50-avf"></a>
+        <a name="64b-2t1c-features-oacl50-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-features-avf"></a>
+        <a name="64b-4t2c-features-iacl50-avf"></a>
+        <a name="64b-4t2c-features-oacl50-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-features-avf"></a>
+        <a name="64b-8t4c-features-iacl50-avf"></a>
+        <a name="64b-8t4c-features-oacl50-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-features-ip4routing-base-dpdk
+    `````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-features-dpdk"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-features-dpdk"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-features-dpdk"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index 5b5b495dc2..39f73ff5ad 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -3,6 +3,9 @@ IPv4 Routing
 
 .. toctree::
 
+    ip4-2n-clx-xxv710
+    ip4-2n-clx-x710
+    ip4-2n-clx-cx556a
     ip4-2n-skx-xxv710
     ip4-2n-skx-x710
     ip4-3n-skx-xxv710
@@ -11,6 +14,3 @@ IPv4 Routing
     ip4-3n-tsh-x520
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
-    ip4-2n-clx-xxv710
-    ip4-2n-clx-x710
-    ip4-2n-clx-cx556a
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 8b83575ab4..02ddee81aa 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -3,6 +3,9 @@ IPv6 Routing
 
 .. toctree::
 
+    ip6-2n-clx-xxv710
+    ip6-2n-clx-x710
+    ip6-2n-clx-cx556a
     ip6-2n-skx-xxv710
     ip6-2n-skx-x710
     ip6-3n-skx-xxv710
@@ -11,6 +14,3 @@ IPv6 Routing
     ip6-3n-tsh-x520
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
-    ip6-2n-clx-xxv710
-    ip6-2n-clx-x710
-    ip6-2n-clx-cx556a
diff --git a/docs/cpta/trending/ipsec-3n-tsh-x520.rst b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
index fd1f76feec..a437766b56 100644
--- a/docs/cpta/trending/ipsec-3n-tsh-x520.rst
+++ b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
@@ -4,14 +4,6 @@
 imix-ipsec-ip4routing-base-scale-sw-ixgbe
 `````````````````````````````````````````
 
-..
-    10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    10ge2p1x520-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-
 1t1c
 ::::
 
@@ -56,3 +48,51 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-imix-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
     <p><br></p>
     </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-ixgbe
+``````````````````````````````````````````
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="1518b-1t1c-base-sw-ixgbe"></a>
+    <a name="1518b-1t1c-scale-sw-ixgbe"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-1t1c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="1518b-2t2c-base-sw-ixgbe"></a>
+    <a name="1518b-2t2c-scale-sw-ixgbe"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-2t2c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="1518b-4t4c-base-sw-ixgbe"></a>
+    <a name="1518b-4t4c-scale-sw-ixgbe"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-2n-clx-x710.rst b/docs/cpta/trending/l2-2n-clx-x710.rst
index dfc178107f..9343c3a815 100644
--- a/docs/cpta/trending/l2-2n-clx-x710.rst
+++ b/docs/cpta/trending/l2-2n-clx-x710.rst
@@ -1,8 +1,8 @@
 2n-clx-x710
 -----------
 
-64b-l2switching-base-scale-avf
-``````````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c
 ::::
@@ -11,6 +11,8 @@
 
     <a name="64b-2t1c-base-avf"></a>
     <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -26,6 +28,8 @@
 
     <a name="64b-4t2c-base-avf"></a>
     <a name="64b-4t2c-scale-avf"></a>
+    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -41,59 +45,12 @@
 
     <a name="64b-8t4c-base-avf"></a>
     <a name="64b-8t4c-scale-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-base-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-4t2c-l2-base-scale-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
     <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-skx-x710.rst b/docs/cpta/trending/l2-2n-skx-x710.rst
index e557f6ca9b..720c4af41a 100644
--- a/docs/cpta/trending/l2-2n-skx-x710.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c
 ::::
@@ -10,14 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
+    <a name="64b-2t1c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -27,14 +25,12 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
+    <a name="64b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -44,13 +40,59 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-scale-dpdk"></a>
+    <a name="64b-8t4c-scale-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-dpdk
+```````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710.rst b/docs/cpta/trending/l2-3n-skx-xxv710.rst
index 93dbe05039..236f4e9660 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710.rst
@@ -91,8 +91,8 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c
 ::::
@@ -138,57 +138,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
-
-64b-features-l2switching-base-avf
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-avf"></a>
-    <a name="64b-2t1c-features-iacl50-avf"></a>
-    <a name="64b-2t1c-features-oacl50-avf"></a>
-    <a name="64b-2t1c-features-macip-iacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-avf"></a>
-    <a name="64b-4t2c-features-iacl50-avf"></a>
-    <a name="64b-4t2c-features-oacl50-avf"></a>
-    <a name="64b-4t2c-features-macip-iacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-avf"></a>
-    <a name="64b-8t4c-features-iacl50-avf"></a>
-    <a name="64b-8t4c-features-oacl50-avf"></a>
-    <a name="64b-8t4c-features-macip-iacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index 3d7e6c7d92..2d40875cef 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -3,6 +3,9 @@ L2 Ethernet Switching
 
 .. toctree::
 
+    l2-2n-clx-xxv710
+    l2-2n-clx-x710
+    l2-2n-clx-cx556a
     l2-2n-skx-xxv710
     l2-2n-skx-x710
     l2-3n-skx-xxv710
@@ -11,6 +14,3 @@ L2 Ethernet Switching
     l2-3n-tsh-x520
     l2-2n-dnv-x553
     l2-3n-dnv-x553
-    l2-2n-clx-xxv710
-    l2-2n-clx-x710
-    l2-2n-clx-cx556a
diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst
index 96451d8c17..6c177ac510 100644
--- a/docs/cpta/trending/srv6.rst
+++ b/docs/cpta/trending/srv6.rst
@@ -3,9 +3,9 @@ SRv6 Routing
 
 .. toctree::
 
-    srv6-3n-skx-xxv710
     srv6-3n-hsw-xl710
     srv6-3n-tsh-x520
 
 ..
+    srv6-3n-skx-xxv710
     srv6-3n-dnv-x553
diff --git a/docs/cpta/trending/vhost.rst b/docs/cpta/trending/vhost.rst
index e9e869f6f2..a33e599d82 100644
--- a/docs/cpta/trending/vhost.rst
+++ b/docs/cpta/trending/vhost.rst
@@ -3,13 +3,13 @@ VMs vhost-user
 
 .. toctree::
 
+    vhost-2n-clx-xxv710
+    vhost-2n-clx-cx556a
     vhost-2n-skx-xxv710
     vhost-3n-skx-xxv710
     vhost-3n-skx-x710
     vhost-3n-hsw-xl710
     vhost-3n-tsh-x520
-    vhost-2n-clx-xxv710
-    vhost-2n-clx-cx556a
 
 ..
     vhost-3n-skx-x710 - keeps failing
diff --git a/docs/cpta/trending/vts-2n-skx-xxv710.rst b/docs/cpta/trending/vts-2n-skx-xxv710.rst
index 417b0ef58d..697f6ec5ca 100644
--- a/docs/cpta/trending/vts-2n-skx-xxv710.rst
+++ b/docs/cpta/trending/vts-2n-skx-xxv710.rst
@@ -1,21 +1,20 @@
 2n-skx-xxv710
 -------------
 
-114b-vts-l2switching-base-avf-dpdk
-``````````````````````````````````
+114b-vts-l2switching-base-avf
+`````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="114b-2t1c-base-dpdk"></a>
     <a name="114b-2t1c-base-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,13 +23,12 @@
 
 .. raw:: html
 
-    <a name="114b-4t2c-base-dpdk"></a>
     <a name="114b-4t2c-base-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -39,12 +37,11 @@
 
 .. raw:: html
 
-    <a name="114b-8t4c-base-dpdk"></a>
     <a name="114b-8t4c-base-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vts.rst b/docs/cpta/trending/vts.rst
index e5836f462a..8966e927bd 100644
--- a/docs/cpta/trending/vts.rst
+++ b/docs/cpta/trending/vts.rst
@@ -3,4 +3,5 @@ Virtual Topology System
 
 .. toctree::
 
+    vts-2n-clx-xxv710
     vts-2n-skx-xxv710