Trending: Reorganization

+ use selection of tests by their full names
+ finalize trending_test_groups.md
+ modify static content
+ modify anchors
+ specifications:
  + container memif
  + ip4
  + ip4 tunnels
  + ip6
  + ipsec
  + l2
  + srv6
  + vhost
  + vts
  + dpdk
+ add 2n-clx
+ hyperlinks

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

182 files changed, 4040 insertions, 5065 deletions

diff --git a/docs/cpta/data/index.rst b/docs/cpta/data/index.rst
index c9cc4902c4..035f216ce1 100644
--- a/docs/cpta/data/index.rst
+++ b/docs/cpta/data/index.rst
@@ -21,6 +21,11 @@ in the ASCII and CSV formats:
         - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-skx-trending.txt>`_
         - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-skx-trending.csv>`_
 
+    - 2n-clx
+
+        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-clx-trending.txt>`_
+        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-clx-trending.csv>`_
+
     - 3n-tsh
 
         - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-tsh-trending.txt>`_
diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 6282784d6a..83a290a859 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -28,13 +28,11 @@ analysis and anomaly detection methodology.
     trending/l2
     trending/ip4
     trending/ip6
+    trending/srv6
     trending/ip4_tunnels
-    trending/vm_vhost_l2
-    trending/vm_vhost_ip4
+    trending/vhost
     trending/container_memif
     trending/ipsec
-    trending/srv6
-    trending/link_bonding
     trending/vts
     trending/nf_service_density
     trending/dpdk
diff --git a/docs/cpta/introduction/dashboard.rst b/docs/cpta/introduction/dashboard.rst
index 1fb77f709f..38754b5e0b 100644
--- a/docs/cpta/introduction/dashboard.rst
+++ b/docs/cpta/introduction/dashboard.rst
@@ -13,23 +13,23 @@ Legend to the tables:
     - **Regressions [#]**: Number of regressions detected.
     - **Progressions [#]**: Number of progressions detected.
 
-3n-hsw
+2n-skx
 ------
 
-VPP worker on 1t1c
+VPP worker on 2t1c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-1t1c-3n-hsw.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t1c-2n-skx.rst
 
-VPP worker on 2t2c
+VPP worker on 4t2c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t2c-3n-hsw.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t2c-2n-skx.rst
 
-VPP worker on 4t4c
+VPP worker on 8t4c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t4c-3n-hsw.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-8t4c-2n-skx.rst
 
 3n-skx
 ------
@@ -49,23 +49,23 @@ VPP worker on 8t4c
 
 .. include:: ../../../_build/_static/vpp/performance-trending-dashboard-8t4c-3n-skx.rst
 
-2n-skx
+3n-hsw
 ------
 
-VPP worker on 2t1c
+VPP worker on 1t1c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t1c-2n-skx.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-1t1c-3n-hsw.rst
 
-VPP worker on 4t2c
+VPP worker on 2t2c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t2c-2n-skx.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t2c-3n-hsw.rst
 
-VPP worker on 8t4c
+VPP worker on 4t4c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-8t4c-2n-skx.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t4c-3n-hsw.rst
 
 3n-tsh
 ------
@@ -85,6 +85,24 @@ VPP worker on 4t4c
 
 .. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t4c-3n-tsh.rst
 
+2n-dnv
+------
+
+VPP worker on 1t1c
+``````````````````
+
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-1t1c-2n-dnv.rst
+
+VPP worker on 2t2c
+``````````````````
+
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t2c-2n-dnv.rst
+
+VPP worker on 4t4c
+``````````````````
+
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t4c-2n-dnv.rst
+
 3n-dnv
 ------
 
@@ -103,20 +121,20 @@ VPP worker on 4t4c
 
 .. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t4c-3n-dnv.rst
 
-2n-dnv
+2n-clx
 ------
 
-VPP worker on 1t1c
+VPP worker on 2t1c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-1t1c-2n-dnv.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t1c-2n-clx.rst
 
-VPP worker on 2t2c
+VPP worker on 4t2c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-2t2c-2n-dnv.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t2c-2n-clx.rst
 
-VPP worker on 4t4c
+VPP worker on 8t4c
 ``````````````````
 
-.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-4t4c-2n-dnv.rst
+.. include:: ../../../_build/_static/vpp/performance-trending-dashboard-8t4c-2n-clx.rst
diff --git a/docs/cpta/introduction/failures.rst b/docs/cpta/introduction/failures.rst
index 2e2c6ebec8..f49a7fc26a 100644
--- a/docs/cpta/introduction/failures.rst
+++ b/docs/cpta/introduction/failures.rst
@@ -13,32 +13,37 @@ Legend to the tables:
     - **Last Failure [VPP-Build-Id]**: VPP build as of last failure.
     - **Last Failure [CSIT-Job-Build-Id]**: CSIT build as of last failure.
 
-3n-hsw
+2n-skx
 ------
 
-.. include:: ../../../_build/_static/vpp/failed-tests-3n-hsw.rst
+.. include:: ../../../_build/_static/vpp/failed-tests-2n-skx.rst
 
 3n-skx
 ------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-skx.rst
 
-2n-skx
+3n-hsw
 ------
 
-.. include:: ../../../_build/_static/vpp/failed-tests-2n-skx.rst
+.. include:: ../../../_build/_static/vpp/failed-tests-3n-hsw.rst
 
 3n-tsh
 ------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-tsh.rst
 
+2n-dnv
+------
+
+.. include:: ../../../_build/_static/vpp/failed-tests-2n-dnv.rst
+
 3n-dnv
 ------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-dnv.rst
 
-2n-dnv
+2n-clx
 ------
 
-.. include:: ../../../_build/_static/vpp/failed-tests-2n-dnv.rst
+.. include:: ../../../_build/_static/vpp/failed-tests-2n-clx.rst
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/container_memif-2n-clx-xxv710.rst
index 933bb64878..79f0e5ce00 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
+++ b/docs/cpta/trending/container_memif-2n-clx-xxv710.rst
@@ -1,44 +1,53 @@
-3n-hsw-x520-64b-features-iacl
------------------------------
+2n-clx-xxv710
+-------------
 
-1t1c
-````
+64b-memif-base-i40e
+```````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr
+
+2t1c
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-features-iacl"></a>
+    <a name="64b-2t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ip4-feature-1t1c-x520-3n-hsw-iacl.html"></iframe>
+    <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-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
-2t2c
-````
+4t2c
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-features-iacl"></a>
+    <a name="64b-4t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ip4-feature-2t2c-x520-3n-hsw-iacl.html"></iframe>
+    <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-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
-4t4c
-````
+8t4c
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-features-iacl"></a>
+    <a name="64b-8t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ip4-feature-4t4c-x520-3n-hsw-iacl.html"></iframe>
+    <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-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst b/docs/cpta/trending/container_memif-2n-skx-xxv710.rst
index 349d0b4c1e..66435740b0 100644
--- a/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-xxv710.rst
@@ -1,44 +1,53 @@
-2n-skx-x710-imix-base
----------------------
+2n-skx-xxv710
+-------------
+
+64b-memif-base-i40e
+```````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-2t1c-base"></a>
+    <a name="64b-2t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t1c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-4t2c-base"></a>
+    <a name="64b-4t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t2c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-4t2c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-8t4c-base"></a>
+    <a name="64b-8t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-8t4c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-8t4c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst b/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
deleted file mode 100644
index eeb114aa24..0000000000
--- a/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-64b-base
----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-container-memif-l2-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst b/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
deleted file mode 100644
index bc36680da7..0000000000
--- a/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-imix-base
-----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst b/docs/cpta/trending/container_memif-3n-skx-xxv710.rst
index 633269da66..96dc856933 100644
--- a/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-xxv710.rst
@@ -1,44 +1,54 @@
-3n-skx-x710-imix-base
----------------------
+3n-skx-xxv710
+-------------
+
+64b-memif-base-i40e
+```````````````````
+
+..
+    25ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-mrr
+    25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr
+    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
+    25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-2t1c-base"></a>
+    <a name="64b-2t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t1c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-4t2c-base"></a>
+    <a name="64b-4t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t2c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-8t4c-base"></a>
+    <a name="64b-8t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-8t4c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-tsh-x520-64b-base.rst b/docs/cpta/trending/container_memif-3n-tsh-x520.rst
index ab00046b5a..3bb47a78e9 100644
--- a/docs/cpta/trending/container_memif-3n-tsh-x520-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-tsh-x520.rst
@@ -1,44 +1,54 @@
-3n-tsh-x520-64b-base
---------------------
+3n-tsh-xxv710
+-------------
+
+64b-memif-base-ixgbe
+````````````````````
+
+..
+    10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr
+    10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr
+    10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
+    10ge2p1x520-ethip4-ip4base-eth-2memif-1dcr-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base"></a>
+    <a name="64b-1t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-xxv710-64b-1t1c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base"></a>
+    <a name="64b-2t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-xxv710-64b-2t2c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base"></a>
+    <a name="64b-4t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-xxv710-64b-4t4c-memif-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index 75bd798a8e..221ef7b7d1 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -3,16 +3,7 @@ LXC/DRC Container Memif
 
 .. toctree::
 
-    container_memif-3n-hsw-x520-64b-base
-    container_memif-3n-hsw-x710-64b-base
-    container_memif-3n-hsw-xl710-64b-base
-    container_memif-3n-hsw-x520-imix-base
-    container_memif-3n-hsw-x710-imix-base
-    container_memif-3n-hsw-xl710-imix-base
-    container_memif-3n-skx-x710-64b-base
-    container_memif-3n-skx-x710-imix-base
-    container_memif-2n-skx-x710-64b-base
-    container_memif-3n-tsh-x520-64b-base
-
-..
-    container_memif-2n-skx-xxv710-64b-base
+    container_memif-2n-skx-xxv710
+    container_memif-3n-skx-xxv710
+    container_memif-3n-tsh-x520
+    container_memif-2n-clx-xxv710
diff --git a/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst b/docs/cpta/trending/dpdk-2n-skx-x710.rst
index 76f4f878fa..0b885cf426 100644
--- a/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-x710.rst
@@ -1,44 +1,54 @@
-2n-skx-x710-64b
----------------
+2n-skx-x710
+-----------
+
+64b-testpmd-l3fwd
+`````````````````
+
+..
+    2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr
+    2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c"></a>
+    <a name="64b-2t1c-base-testpmd"></a>
+    <a name="64b-2t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c"></a>
+    <a name="64b-4t2c-base-testpmd"></a>
+    <a name="64b-4t2c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c"></a>
+    <a name="64b-8t4c-base-testpmd"></a>
+    <a name="64b-8t4c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst b/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
deleted file mode 100644
index f1986c7993..0000000000
--- a/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b
------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst b/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
deleted file mode 100644
index ab78e78a79..0000000000
--- a/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-imix
-------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst b/docs/cpta/trending/dpdk-2n-skx-xxv710.rst
index f5277dba3d..01a169b016 100644
--- a/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-xxv710.rst
@@ -1,44 +1,53 @@
-2n-skx-x710-imix
-----------------
+2n-skx-xxv710
+-------------
+64b-testpmd-l3fwd
+`````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-2t1c"></a>
+    <a name="64b-2t1c-base-testpmd"></a>
+    <a name="64b-2t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-4t2c"></a>
+    <a name="64b-4t2c-base-testpmd"></a>
+    <a name="64b-4t2c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-4t2c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-8t4c"></a>
+    <a name="64b-8t4c-base-testpmd"></a>
+    <a name="64b-8t4c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-8t4c-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
deleted file mode 100644
index 5b98cef906..0000000000
--- a/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b
----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
deleted file mode 100644
index 5928ee6f2c..0000000000
--- a/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-imix
-----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-x710.rst
index b3298a77e9..7252eede8c 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x710.rst
@@ -1,44 +1,54 @@
-3n-hsw-x520-64b
----------------
+3n-hsw-x710
+-----------
+
+64b-testpmd-l3fwd
+`````````````````
+
+..
+    10ge2p1x710-eth-l2xcbase-testpmd-mrr
+    10ge2p1x710-ethip4-ip4base-l3fwd-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c"></a>
+    <a name="64b-1t1c-base-testpmd"></a>
+    <a name="64b-1t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c"></a>
+    <a name="64b-2t2c-base-testpmd"></a>
+    <a name="64b-1t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-2t2c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c"></a>
+    <a name="64b-4t4c-base-testpmd"></a>
+    <a name="64b-1t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-4t4c-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
deleted file mode 100644
index 7230885fd2..0000000000
--- a/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-64b
-----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
deleted file mode 100644
index 468aafb653..0000000000
--- a/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-imix
------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-xl710.rst
index 72b2c49ddc..f312a809ef 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-xl710.rst
@@ -1,44 +1,54 @@
-3n-hsw-x520-imix
-----------------
+3n-hsw-xl710
+------------
+
+64b-testpmd-l3fwd
+`````````````````
+
+..
+    40ge2p1xl710-eth-l2xcbase-testpmd-mrr
+    40ge2p1xl710-ethip4-ip4base-l3fwd-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-imix-1t1c"></a>
+    <a name="64b-1t1c-base-testpmd"></a>
+    <a name="64b-1t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-imix-2t2c"></a>
+    <a name="64b-2t2c-base-testpmd"></a>
+    <a name="64b-2t2c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-2t2c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-imix-4t4c"></a>
+    <a name="64b-4t4c-base-testpmd"></a>
+    <a name="64b-4t4c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-4t4c-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst b/docs/cpta/trending/dpdk-3n-skx-x710.rst
index 62dd79dacc..e9b3e37afd 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-x710.rst
@@ -1,44 +1,54 @@
 3n-skx-x710-64b
 ---------------
 
+64b-testpmd-l3fwd
+`````````````````
+
+..
+    10ge2p1x710-eth-l2xcbase-testpmd-mrr
+    10ge2p1x710-ethip4-ip4base-l3fwd-mrr
+
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c"></a>
+    <a name="64b-2t1c-base-testpmd"></a>
+    <a name="64b-2t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c"></a>
+    <a name="64b-4t2c-base-testpmd"></a>
+    <a name="64b-4t2c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c"></a>
+    <a name="64b-8t4c-base-testpmd"></a>
+    <a name="64b-8t4c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst b/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
deleted file mode 100644
index 8498b88785..0000000000
--- a/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b
------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst b/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
deleted file mode 100644
index a34527738d..0000000000
--- a/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-imix
-------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst b/docs/cpta/trending/dpdk-3n-skx-xxv710.rst
index 06950b87b2..9576fc3d82 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-xxv710.rst
@@ -1,44 +1,54 @@
-3n-skx-x710-imix
-----------------
+3n-skx-xxv710
+-------------
+
+64b-testpmd-l3fwd
+`````````````````
+
+..
+    25ge2p1xxv710-eth-l2xcbase-testpmd-mrr
+    25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-2t1c"></a>
+    <a name="64b-2t1c-base-testpmd"></a>
+    <a name="64b-2t1c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-4t2c"></a>
+    <a name="64b-4t2c-base-testpmd"></a>
+    <a name="64b-4t2c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-8t4c"></a>
+    <a name="64b-8t4c-base-testpmd"></a>
+    <a name="64b-8t4c-base-l3fwd"></a>
     <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk.rst b/docs/cpta/trending/dpdk.rst
index 6dc24f8223..145fd9b245 100644
--- a/docs/cpta/trending/dpdk.rst
+++ b/docs/cpta/trending/dpdk.rst
@@ -3,10 +3,9 @@ DPDK
 
 .. toctree::
 
-    dpdk-3n-hsw-x520-64b
-    dpdk-3n-hsw-x710-64b
-    dpdk-3n-hsw-xl710-64b
-    dpdk-3n-skx-x710-64b
-    dpdk-3n-skx-xxv710-64b
-    dpdk-2n-skx-x710-64b
-    dpdk-2n-skx-xxv710-64b
+    dpdk-2n-skx-xxv710
+    dpdk-2n-skx-x710
+    dpdk-3n-skx-xxv710
+    dpdk-3n-skx-x710
+    dpdk-3n-hsw-xl710
+    dpdk-3n-hsw-x710
diff --git a/docs/cpta/trending/ip4-2n-clx-x710.rst b/docs/cpta/trending/ip4-2n-clx-x710.rst
new file mode 100644
index 0000000000..d297a0f0ec
--- /dev/null
+++ b/docs/cpta/trending/ip4-2n-clx-x710.rst
@@ -0,0 +1,64 @@
+2n-clx-x710
+-----------
+
+64b-ip4routing-base-scale-avf-i40e
+``````````````````````````````````
+
+..
+    2n1l-10ge2p1x710-avf-ethip4-ip4base-mrr
+    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-mrr
+    2n1l-10ge2p1x710-dot1q-ip4base-mrr
+    2n1l-10ge2p1x710-ethip4-ip4base-mrr
+    2n1l-10ge2p1x710-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-ip4-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-avf"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-ip4-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-avf"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-ip4-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip4-2n-clx-xxv710.rst b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..83ae4e168d
--- /dev/null
+++ b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
@@ -0,0 +1,165 @@
+2n-clx-xxv710
+-------------
+
+64b-ip4routing-base-scale-avf
+`````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-avf-dot1q-ip4base-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4base-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale20k-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale200k-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></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-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-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></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-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-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <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-xxv710-64b-8t4c-ip4-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-base-scale-i40e
+``````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-dot1q-ip4base-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4scale20k-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4scale200k-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-features-ip4routing-base-i40e
+`````````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-ethip4-ip4base-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-nat44-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsecsw-3n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-2n-dnv-x553.rst
index 2e8baa67b1..b6aab0dfb3 100644
--- a/docs/cpta/trending/ipsecsw-3n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-2n-dnv-x553.rst
@@ -1,89 +1,106 @@
-3n-skx-x710-64b-base-scale-sw-int
----------------------------------
+2n-dnv-x553
+-----------
 
-2t1c
-````
+64b-ip4routing-base-scale-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x553-dot1q-l2xcbase-mrr
+    10ge2p1x553-eth-l2xcbase-mrr
+    10ge2p1x553-dot1q-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+
+1t1c
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-base-scale-int"></a>
+    <a name="64b-1t1c-base-scale-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-int-2t1c-x710-3n-skx.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-1t1c-ip4-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-4t2c
-````
+2t2c
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-base-scale-int"></a>
+    <a name="64b-2t2c-base-scale-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-int-4t2c-x710-3n-skx.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-2t2c-ip4-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-8t4c
-````
+4t4c
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-base-scale-int"></a>
+    <a name="64b-4t4c-base-scale-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-int-8t4c-x710-3n-skx.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-4t4c-ip4-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-3n-skx-x710-64b-base-scale-sw-tnl
----------------------------------
+64b-features-ip4routing-base-ixgbe
+``````````````````````````````````
+
+..
+    10ge2p1x553-eth-l2patch-mrr
+    10ge2p1x553-eth-l2xcbase-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdscale10kmaclrn-mrr
+    10ge2p1x553-eth-l2bdscale100kmaclrn-mrr
+    10ge2p1x553-eth-l2bdscale1mmaclrn-mrr
 
-2t1c
-````
+1t1c
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-base-scale-tnl"></a>
+    <a name="64b-1t1c-features-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-tnl-2t1c-x710-3n-skx.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-1t1c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-4t2c
-````
+2t2c
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-base-scale-tnl"></a>
+    <a name="64b-2t2c-features-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-tnl-4t2c-x710-3n-skx.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-2t2c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-8t4c
-````
+4t4c
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-base-scale-tnl"></a>
+    <a name="64b-4t4c-features-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-tnl-8t4c-x710-3n-skx.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-4t4c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
deleted file mode 100644
index 6cab9dcdf3..0000000000
--- a/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b-base-scale
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst b/docs/cpta/trending/ip4-2n-skx-x710.rst
index 92506ec7e5..44051dfa4c 100644
--- a/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-2n-skx-x710.rst
@@ -1,44 +1,64 @@
-2n-skx-x710-64b-features
-------------------------
+2n-skx-x710
+-----------
+
+64b-ip4routing-base-scale-avf-i40e
+``````````````````````````````````
+
+..
+    2n1l-10ge2p1x710-avf-ethip4-ip4base-mrr
+    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-mrr
+    2n1l-10ge2p1x710-dot1q-ip4base-mrr
+    2n1l-10ge2p1x710-ethip4-ip4base-mrr
+    2n1l-10ge2p1x710-ethip4-ip4scale2m-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-features"></a>
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ip4-feature-2t1c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-avf-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-features"></a>
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-avf"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ip4-feature-4t2c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-ip4-avf-i40e.html"></iframe>
     <p><br></p>
     </center>
 
+
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-features"></a>
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-avf"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ip4-feature-8t4c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-ip4-avf-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
deleted file mode 100644
index 1a99611a30..0000000000
--- a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-base-scale
-----------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
deleted file mode 100644
index 10c7d9e7d0..0000000000
--- a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-features
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-xxv710.rst b/docs/cpta/trending/ip4-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..afae2dc4aa
--- /dev/null
+++ b/docs/cpta/trending/ip4-2n-skx-xxv710.rst
@@ -0,0 +1,165 @@
+2n-skx-xxv710
+-------------
+
+64b-ip4routing-base-scale-avf
+`````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-avf-dot1q-ip4base-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4base-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale20k-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale200k-mrr
+    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></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-xxv710-64b-2t1c-ip4-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></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-xxv710-64b-4t2c-ip4-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-8t4c-ip4-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-base-scale-i40e
+``````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-dot1q-ip4base-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4scale20k-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4scale200k-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t1c-ip4-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t2c-ip4-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-8t4c-ip4-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-features-ip4routing-base-i40e
+`````````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-ethip4-ip4base-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-mrr
+    2n1l-25ge2p1xxv710-ethip4udp-ip4base-nat44-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t1c-ip4-features-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t2c-ip4-features-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-8t4c-ip4-features-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsechw-3n-dnv-x553-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-dnv-x553.rst
index 4ae7361d10..87dc8af338 100644
--- a/docs/cpta/trending/ipsechw-3n-dnv-x553-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-dnv-x553.rst
@@ -1,89 +1,110 @@
-3n-dnv-x553-64b-base-scale-hw-int
----------------------------------
+3n-dnv-x553
+-----------
+
+64b-ip4routing-base-scale-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x553-dot1q-ip4base-mrr
+    10ge2p1x553-ethip4-ip4base-mrr
+    10ge2p1x553-ethip4-ip4scale20k-mrr
+    10ge2p1x553-ethip4-ip4scale200k-mrr
+    10ge2p1x553-ethip4-ip4scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-1t1c-base-scale-int"></a>
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsechw-int-1t1c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-1t1c-ip4-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-2t2c-base-scale-int"></a>
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsechw-int-2t2c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-2t2c-ip4-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-4t4c-base-scale-int"></a>
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsechw-int-4t4c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-4t4c-ip4-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-3n-dnv-x553-64b-base-scale-hw-tnl
----------------------------------
+64b-features-ip4routing-base-ixgbe
+``````````````````````````````````
+
+..
+    10ge2p1x553-ethip4-ip4base-mrr
+    10ge2p1x553-ethip4udp-ip4base-iacl50sf-10kflows-mrr
+    10ge2p1x553-ethip4udp-ip4base-iacl50sl-10kflows-mrr
+    10ge2p1x553-ethip4udp-ip4base-oacl50sf-10kflows-mrr
+    10ge2p1x553-ethip4udp-ip4base-oacl50sl-10kflows-mrr
+    10ge2p1x553-ethip4udp-ip4base-nat44-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-1t1c-base-scale-tnl"></a>
+    <a name="64b-1t1c-features-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsechw-tnl-1t1c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-1t1c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-2t2c-base-scale-tnl"></a>
+    <a name="64b-2t2c-features-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsechw-tnl-2t2c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-2t2c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-4t4c-base-scale-tnl"></a>
+    <a name="64b-4t4c-features-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsechw-tnl-4t4c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-4t4c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
deleted file mode 100644
index 5d0e6e68f3..0000000000
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
deleted file mode 100644
index bed154a0d3..0000000000
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-features-oacl
------------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-features-oacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-1t1c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-features-oacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-2t2c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-features-oacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-4t4c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
deleted file mode 100644
index e9119910ec..0000000000
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-features
-------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
deleted file mode 100644
index 0f951df69f..0000000000
--- a/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst b/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
deleted file mode 100644
index 352e231e4a..0000000000
--- a/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-features
-------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst b/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst
deleted file mode 100644
index 27256b5d07..0000000000
--- a/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-64b-base-scale-features
-------------------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-1t1c-base-scale-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-2t2c-base-scale-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-4t4c-base-scale-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/ip4-3n-hsw-xl710.rst
index f2ed070186..0ee4ea5df8 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-xl710.rst
@@ -1,44 +1,57 @@
-3n-hsw-x710-imix-base
----------------------
+3n-hsw-xl710
+------------
+
+64b-ip4routing-base-scale-i40e
+``````````````````````````````
+
+..
+    40ge2p1xl710-dot1q-ip4base-mrr
+    40ge2p1xl710-ethip4-ip4base-mrr
+    40ge2p1xl710-ethip4-ip4scale20k-mrr
+    40ge2p1xl710-ethip4-ip4scale200k-mrr
+    40ge2p1xl710-ethip4-ip4scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-1t1c-base"></a>
+    <a name="64b-1t1c-base-i40e"></a>
+    <a name="64b-1t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-1t1c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-2t2c-base"></a>
+    <a name="64b-2t2c-base-i40e"></a>
+    <a name="64b-2t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t2c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-2t2c-ip4-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-imix-4t4c-base"></a>
+    <a name="64b-4t4c-base-i40e"></a>
+    <a name="64b-4t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t4c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-4t4c-ip4-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
deleted file mode 100644
index dc2e98cd9f..0000000000
--- a/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b-base-scale
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst b/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
deleted file mode 100644
index b7f3d82e79..0000000000
--- a/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b-features
-------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-x710.rst b/docs/cpta/trending/ip4-3n-skx-x710.rst
new file mode 100644
index 0000000000..15f0f2a59e
--- /dev/null
+++ b/docs/cpta/trending/ip4-3n-skx-x710.rst
@@ -0,0 +1,64 @@
+3n-skx-x710
+-----------
+
+64b-ip4routing-base-scale-avf-i40e
+``````````````````````````````````
+
+..
+    10ge2p1x710-avf-ethip4-ip4base-mrr
+    10ge2p1x710-avf-ethip4-ip4scale2m-mrr
+    10ge2p1x710-dot1q-ip4base-mrr
+    10ge2p1x710-ethip4-ip4base-mrr
+    10ge2p1x710-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-2t1c-ip4-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-avf"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-4t2c-ip4-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-avf"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-8t4c-ip4-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
deleted file mode 100644
index 4fe8bbbf9a..0000000000
--- a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-base-scale
-----------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
deleted file mode 100644
index 18f81c163a..0000000000
--- a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-features
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-feature-8t4c-xxv710-3n-skx.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
new file mode 100644
index 0000000000..e2688101c5
--- /dev/null
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
@@ -0,0 +1,165 @@
+3n-skx-xxv710
+-------------
+
+64b-ip4routing-base-scale-avf
+`````````````````````````````
+
+..
+    25ge2p1xxv710-avf-dot1q-ip4base-mrr
+    25ge2p1xxv710-avf-ethip4-ip4base-mrr
+    25ge2p1xxv710-avf-ethip4-ip4scale20k-mrr
+    25ge2p1xxv710-avf-ethip4-ip4scale200k-mrr
+    25ge2p1xxv710-avf-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></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-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-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></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-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-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <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-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-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-base-scale-i40e
+``````````````````````````````
+
+..
+    25ge2p1xxv710-dot1q-ip4base-mrr
+    25ge2p1xxv710-ethip4-ip4base-mrr
+    25ge2p1xxv710-ethip4-ip4scale20k-mrr
+    25ge2p1xxv710-ethip4-ip4scale200k-mrr
+    25ge2p1xxv710-ethip4-ip4scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-features-ip4routing-base-i40e
+`````````````````````````````````
+
+..
+    25ge2p1xxv710-ethip4-ip4base-mrr
+    25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-mrr
+    25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-mrr
+    25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-mrr
+    25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-mrr
+    25ge2p1xxv710-ethip4udp-ip4base-nat44-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsecsw-3n-tsh-x520-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-tsh-x520.rst
index e433725d15..452caf3cce 100644
--- a/docs/cpta/trending/ipsecsw-3n-tsh-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-tsh-x520.rst
@@ -1,89 +1,110 @@
-3n-tsh-x520-64b-base-scale-sw-int
----------------------------------
+3n-tsh-x520
+-----------
+
+64b-ip4routing-base-scale-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x520-dot1q-ip4base-mrr
+    10ge2p1x520-ethip4-ip4base-mrr
+    10ge2p1x520-ethip4-ip4scale20k-mrr
+    10ge2p1x520-ethip4-ip4scale200k-mrr
+    10ge2p1x520-ethip4-ip4scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base-scale-int"></a>
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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/cpta-ipsecsw-int-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-64b-1t1c-ip4-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base-scale-int"></a>
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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/cpta-ipsecsw-int-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-64b-2t2c-ip4-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base-scale-int"></a>
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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/cpta-ipsecsw-int-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-64b-4t4c-ip4-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
-3n-tsh-x520-64b-base-scale-sw-tnl
----------------------------------
+64b-features-ip4routing-base-ixgbe
+``````````````````````````````````
+
+..
+    10ge2p1x520-ethip4-ip4base-mrr
+    10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr
+    10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr
+    10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-mrr
+    10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-mrr
+    10ge2p1x520-ethip4udp-ip4base-nat44-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base-scale-tnl"></a>
+    <a name="64b-1t1c-features-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/cpta-ipsecsw-tnl-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-64b-1t1c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base-scale-tnl"></a>
+    <a name="64b-2t2c-features-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/cpta-ipsecsw-tnl-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-64b-2t2c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base-scale-tnl"></a>
+    <a name="64b-4t4c-features-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/cpta-ipsecsw-tnl-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-64b-4t4c-ip4-features-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index 6b6d2fe3d8..ac1b87d0db 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -3,23 +3,13 @@ IPv4 Routing
 
 .. toctree::
 
-    ip4-3n-hsw-x520-64b-base-scale
-    ip4-3n-hsw-x520-64b-features
-    ip4-3n-hsw-x520-64b-features-iacl
-    ip4-3n-hsw-x520-64b-features-oacl
-    ip4-3n-hsw-x710-64b-base-scale
-    ip4-3n-hsw-x710-64b-features
-    ip4-3n-hsw-xl710-64b-base-scale-features
-    ip4-3n-skx-x710-64b-base-scale
-    ip4-3n-skx-x710-64b-features
-    ip4-3n-skx-xxv710-64b-base-scale
-    ip4-2n-skx-x710-64b-base-scale
-    ip4-2n-skx-x710-64b-features
-    ip4-2n-skx-xxv710-64b-base-scale
-    ip4-3n-tsh-x520-64b-base-scale
-    ip4-3n-tsh-x520-64b-features
-    ip4-3n-dnv-x553-64b-base-scale
-    ip4-2n-dnv-x553-64b-base-scale
-
-..
-    ip4-2n-skx-xxv710-64b-features
+    ip4-2n-skx-xxv710
+    ip4-2n-skx-x710
+    ip4-3n-skx-xxv710
+    ip4-3n-skx-x710
+    ip4-3n-hsw-xl710
+    ip4-3n-tsh-x520
+    ip4-2n-dnv-x553
+    ip4-3n-dnv-x553
+    ip4-2n-clx-xxv710
+    ip4-2n-clx-x710
diff --git a/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
deleted file mode 100644
index 5f7b8bacdd..0000000000
--- a/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b-base
---------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
deleted file mode 100644
index 28558591e5..0000000000
--- a/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-base
-----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip6-3n-dnv-x553-78b-base-scale.rst b/docs/cpta/trending/ip4_tunnels-3n-dnv-x553.rst
index d840d47302..e9a09bba2b 100644
--- a/docs/cpta/trending/ip6-3n-dnv-x553-78b-base-scale.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-dnv-x553.rst
@@ -1,44 +1,56 @@
-3n-dnv-x553-78b-base-scale
---------------------------
+3n-dnv-x553
+-----------
+
+64b-ip4tunnel-base-scale-ixgbe
+``````````````````````````````
+
+..
+    10ge2p1x553-ethip4vxlan-l2xcbase-mrr
+    10ge2p1x553-ethip4vxlan-l2bdbasemaclrn-mrr
+    10ge2p1x553-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr
+    10ge2p1x553-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-78b-1t1c-base-scale"></a>
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-1t1c-ip4-tunnels-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-78b-2t2c-base-scale"></a>
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-2t2c-ip4-tunnels-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-78b-4t4c-base-scale"></a>
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-4t4c-ip4-tunnels-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
deleted file mode 100644
index f5a9b7fdc4..0000000000
--- a/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
deleted file mode 100644
index 9515c693a3..0000000000
--- a/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-hsw-xl710.rst
index 5e4df108aa..01dc51e223 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-hsw-xl710.rst
@@ -1,44 +1,51 @@
-3n-hsw-x520-64b-base
---------------------
+3n-hsw-xl710
+------------
+
+64b-ip4tunnel-base-i40e
+```````````````````````
+
+..
+    40ge2p1xl710-ethip4vxlan-l2xcbase-mrr
+    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base"></a>
+    <a name="64b-1t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-tunnels-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base"></a>
+    <a name="64b-2t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-2t2c-ip4-tunnels-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base"></a>
+    <a name="64b-4t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-4t4c-ip4-tunnels-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
deleted file mode 100644
index 8a6a39e067..0000000000
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b-base
---------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
deleted file mode 100644
index e316ffe932..0000000000
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-base
-----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..bbaf112fa4
--- /dev/null
+++ b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst
@@ -0,0 +1,56 @@
+3n-skx-xxv710
+-------------
+
+64b-ip4tunnel-base-scale-i40e
+`````````````````````````````
+
+..
+    25ge2p1xxv710-ethip4vxlan-l2xcbase-mrr
+    25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-mrr
+    25ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr
+    25ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-tunnels-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-tunnels-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-tunnels-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-tsh-x520-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-tsh-x520-64b-base.rst
deleted file mode 100644
index bf3d5b3d95..0000000000
--- a/docs/cpta/trending/ip4_tunnels-3n-tsh-x520-64b-base.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-3n-tsh-x520-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-1t1c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip4-tunnels-2t2c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-tsh-x520.rst b/docs/cpta/trending/ip4_tunnels-3n-tsh-x520.rst
new file mode 100644
index 0000000000..d7c9906ef8
--- /dev/null
+++ b/docs/cpta/trending/ip4_tunnels-3n-tsh-x520.rst
@@ -0,0 +1,56 @@
+3n-tsh-x520
+-----------
+
+64b-ip4tunnel-base-scale-ixgbe
+``````````````````````````````
+
+..
+    10ge2p1x520-ethip4vxlan-l2xcbase-mrr
+    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr
+    10ge2p1x520-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr
+    10ge2p1x520-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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-64b-1t1c-ip4-tunnels-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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-64b-2t2c-ip4-tunnels-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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-64b-4t4c-ip4-tunnels-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst
index a172d42388..a6488cd1fa 100644
--- a/docs/cpta/trending/ip4_tunnels.rst
+++ b/docs/cpta/trending/ip4_tunnels.rst
@@ -3,8 +3,7 @@ IPv4 Tunnels
 
 .. toctree::
 
-    ip4_tunnels-3n-hsw-x520-64b-base
-    ip4_tunnels-3n-hsw-x710-64b-base
-    ip4_tunnels-3n-skx-x710-64b-base
-    ip4_tunnels-3n-tsh-x520-64b-base
-    ip4_tunnels-3n-dnv-x553-64b-base
+    ip4_tunnels-3n-skx-xxv710
+    ip4_tunnels-3n-hsw-xl710
+    ip4_tunnels-3n-tsh-x520
+    ip4_tunnels-3n-dnv-x553
diff --git a/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/ip6-2n-clx-x710.rst
index d4736f9fb6..106082613b 100644
--- a/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/ip6-2n-clx-x710.rst
@@ -1,44 +1,54 @@
-2n-skx-xxv710-imix-base
------------------------
+2n-clx-x710
+-----------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    2n1l-10ge2p1x710-ethip6-ip6base-mrr
+    2n1l-10ge2p1x710-ethip6-ip6scale2m-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-imix-2t1c-base"></a>
+    <a name="78b-2t1c-base-i40e"></a>
+    <a name="78b-2t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t1c-xxv710-2n-skx.html"></iframe>
+    <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-78b-2t1c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-imix-4t2c-base"></a>
+    <a name="78b-4t2c-base-i40e"></a>
+    <a name="78b-4t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t2c-xxv710-2n-skx.html"></iframe>
+    <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-78b-4t2c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-imix-8t4c-base"></a>
+    <a name="78b-8t4c-base-i40e"></a>
+    <a name="78b-8t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-8t4c-xxv710-2n-skx.html"></iframe>
+    <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-78b-8t4c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-2n-clx-xxv710.rst b/docs/cpta/trending/ip6-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..6ed12906f7
--- /dev/null
+++ b/docs/cpta/trending/ip6-2n-clx-xxv710.rst
@@ -0,0 +1,57 @@
+2n-clx-xxv710
+-------------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-dot1q-ip6base-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6base-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6scale20k-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6scale200k-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6scale2m-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-i40e"></a>
+    <a name="78b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-78b-2t1c-ip6-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="78b-4t2c-base-i40e"></a>
+    <a name="78b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-78b-4t2c-ip6-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="78b-8t4c-base-i40e"></a>
+    <a name="78b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-78b-8t4c-ip6-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip6-2n-dnv-x553-78b-base-scale.rst b/docs/cpta/trending/ip6-2n-dnv-x553-78b-base-scale.rst
deleted file mode 100644
index 423788bb70..0000000000
--- a/docs/cpta/trending/ip6-2n-dnv-x553-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-dnv-x553-78b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x553-78b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x553-2n-dnv.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x553-78b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x553-2n-dnv.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x553-78b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x553-2n-dnv.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-2n-dnv-x553-64b-base-scale.rst b/docs/cpta/trending/ip6-2n-dnv-x553.rst
index 8fa688faa5..374bf98ad5 100644
--- a/docs/cpta/trending/ip4-2n-dnv-x553-64b-base-scale.rst
+++ b/docs/cpta/trending/ip6-2n-dnv-x553.rst
@@ -1,44 +1,57 @@
-2n-dnv-x553-64b-base-scale
---------------------------
+2n-dnv-x553
+-----------
+
+78b-ip6routing-base-scale-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x553-dot1q-ip6base-mrr
+    10ge2p1x553-ethip6-ip6base-mrr
+    10ge2p1x553-ethip6-ip6scale20k-mrr
+    10ge2p1x553-ethip6-ip6scale200k-mrr
+    10ge2p1x553-ethip6-ip6scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-1t1c-base-scale"></a>
+    <a name="78b-1t1c-base-ixgbe"></a>
+    <a name="78b-1t1c-scale-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-2n-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x553-2n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-2t2c-base-scale"></a>
+    <a name="78b-2t2c-base-ixgbe"></a>
+    <a name="78b-2t2c-scale-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-2n-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x553-2n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-4t4c-base-scale"></a>
+    <a name="78b-4t4c-base-ixgbe"></a>
+    <a name="78b-4t4c-scale-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-2n-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x553-2n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst b/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
deleted file mode 100644
index 0fa8ce0870..0000000000
--- a/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-78b-base-scale
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst b/docs/cpta/trending/ip6-2n-skx-x710.rst
index 3b1a843209..f1cbe10630 100644
--- a/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/ip6-2n-skx-x710.rst
@@ -1,44 +1,54 @@
-2n-skx-x710-64b-base
---------------------
+2n-skx-x710
+-----------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    2n1l-10ge2p1x710-ethip6-ip6base-mrr
+    2n1l-10ge2p1x710-ethip6-ip6scale2m-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-base"></a>
+    <a name="78b-2t1c-base-i40e"></a>
+    <a name="78b-2t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t1c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-base"></a>
+    <a name="78b-4t2c-base-i40e"></a>
+    <a name="78b-4t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t2c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-4t2c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-base"></a>
+    <a name="78b-8t4c-base-i40e"></a>
+    <a name="78b-8t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-8t4c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-8t4c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst b/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
deleted file mode 100644
index af35b8a29f..0000000000
--- a/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-78b-base-scale
-----------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-78b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-78b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-78b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/ip6-2n-skx-xxv710.rst
index a7e1e258f9..7e1f4ea42a 100644
--- a/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/ip6-2n-skx-xxv710.rst
@@ -1,44 +1,57 @@
-2n-skx-xxv710-64b-base
-----------------------
+2n-skx-xxv710
+-------------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-dot1q-ip6base-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6base-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6scale20k-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6scale200k-mrr
+    2n1l-25ge2p1xxv710-ethip6-ip6scale2m-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-64b-2t1c-base"></a>
+    <a name="78b-2t1c-base-i40e"></a>
+    <a name="78b-2t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t1c-xxv710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-64b-4t2c-base"></a>
+    <a name="78b-4t2c-base-i40e"></a>
+    <a name="78b-4t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t2c-xxv710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-4t2c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-64b-8t4c-base"></a>
+    <a name="78b-8t4c-base-i40e"></a>
+    <a name="78b-8t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-8t4c-xxv710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-8t4c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-dnv-x553-64b-base-scale.rst b/docs/cpta/trending/ip6-3n-dnv-x553.rst
index 4ec1499f57..1228eb3e6e 100644
--- a/docs/cpta/trending/ip4-3n-dnv-x553-64b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-dnv-x553.rst
@@ -1,44 +1,56 @@
-3n-dnv-x553-64b-base-scale
---------------------------
+3n-dnv-x553
+-----------
+78b-ip6routing-base-scale-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x553-dot1q-ip6base-mrr
+    10ge2p1x553-ethip6-ip6base-mrr
+    10ge2p1x553-ethip6-ip6scale20k-mrr
+    10ge2p1x553-ethip6-ip6scale200k-mrr
+    10ge2p1x553-ethip6-ip6scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-1t1c-base-scale"></a>
+    <a name="78b-1t1c-base-ixgbe"></a>
+    <a name="78b-1t1c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-2t2c-base-scale"></a>
+    <a name="78b-2t2c-base-ixgbe"></a>
+    <a name="78b-2t2c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-4t4c-base-scale"></a>
+    <a name="78b-4t4c-base-ixgbe"></a>
+    <a name="78b-4t4c-scale-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
deleted file mode 100644
index 0c8ee7bf21..0000000000
--- a/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-78b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-78b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-78b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-78b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
deleted file mode 100644
index 041f03ca9c..0000000000
--- a/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-78b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
deleted file mode 100644
index 178377452a..0000000000
--- a/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-78b-base-scale
----------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-78b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-78b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-78b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst b/docs/cpta/trending/ip6-3n-hsw-xl710.rst
index dbbe385142..29d61d6c68 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-xl710.rst
@@ -1,44 +1,55 @@
-3n-hsw-x520-imix-base
----------------------
+3n-hsw-xl710
+------------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    40ge2p1xl710-dot1q-ip6base-mrr
+    40ge2p1xl710-ethip6-ip6base-mrr
+    40ge2p1xl710-ethip6-ip6scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-imix-1t1c-base"></a>
+    <a name="78b-1t1c-base-i40e"></a>
+    <a name="78b-1t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-imix-2t2c-base"></a>
+    <a name="78b-2t2c-base-i40e"></a>
+    <a name="78b-2t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-2t2c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-imix-4t4c-base"></a>
+    <a name="78b-4t4c-base-i40e"></a>
+    <a name="78b-4t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-4t4c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
deleted file mode 100644
index 360d8c53d6..0000000000
--- a/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-78b-base-scale
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-78b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst b/docs/cpta/trending/ip6-3n-skx-x710.rst
index dc26c6d2e3..33ed0b5aaa 100644
--- a/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/ip6-3n-skx-x710.rst
@@ -1,44 +1,54 @@
-3n-skx-x710-64b-base
---------------------
+3n-skx-x710
+-----------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    10ge2p1x710-ethip6-ip6base-mrr
+    10ge2p1x710-ethip6-ip6scale2m-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-base"></a>
+    <a name="78b-2t1c-base-i40e"></a>
+    <a name="78b-2t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t1c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-base"></a>
+    <a name="78b-4t2c-base-i40e"></a>
+    <a name="78b-4t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t2c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-4t2c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-base"></a>
+    <a name="78b-8t4c-base-i40e"></a>
+    <a name="78b-8t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-8t4c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-8t4c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
deleted file mode 100644
index 2a2d0b0f81..0000000000
--- a/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-78b-base-scale
-----------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-78b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-78b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-78b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-ip6-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/ip6-3n-skx-xxv710.rst
index 144ac5f905..cd4a168008 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/ip6-3n-skx-xxv710.rst
@@ -1,44 +1,57 @@
-3n-skx-xxv710-imix-base
------------------------
+3n-skx-xxv710
+-------------
+
+78b-ip6routing-base-scale-i40e
+``````````````````````````````
+
+..
+    25ge2p1xxv710-dot1q-ip6base-mrr
+    25ge2p1xxv710-ethip6-ip6base-mrr
+    25ge2p1xxv710-ethip6-ip6scale20k-mrr
+    25ge2p1xxv710-ethip6-ip6scale200k-mrr
+    25ge2p1xxv710-ethip6-ip6scale2m-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-imix-2t1c-base"></a>
+    <a name="78b-2t1c-base-i40e"></a>
+    <a name="78b-2t1c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-2t1c-xxv710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-imix-4t2c-base"></a>
+    <a name="78b-4t2c-base-i40e"></a>
+    <a name="78b-4t2c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-4t2c-xxv710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-4t2c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-imix-8t4c-base"></a>
+    <a name="78b-8t4c-base-i40e"></a>
+    <a name="78b-8t4c-scale-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-imix-l2-8t4c-xxv710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-8t4c-ip6-base-scale-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-tsh-x520-64b-features.rst b/docs/cpta/trending/ip6-3n-tsh-x520.rst
index 4d3087a586..3e65c04f74 100644
--- a/docs/cpta/trending/ip4-3n-tsh-x520-64b-features.rst
+++ b/docs/cpta/trending/ip6-3n-tsh-x520.rst
@@ -1,44 +1,57 @@
-3n-tsh-x520-64b-features
-------------------------
+3n-tsh-x520
+-----------
+
+78b-ip6routing-base-scale-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x520-dot1q-ip6base-mrr
+    10ge2p1x520-ethip6-ip6base-mrr
+    10ge2p1x520-ethip6-ip6scale20k-mrr
+    10ge2p1x520-ethip6-ip6scale200k-mrr
+    10ge2p1x520-ethip6-ip6scale2m-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-features"></a>
+    <a name="78b-1t1c-base-ixgbe"></a>
+    <a name="78b-1t1c-scale-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/cpta-ip4-feature-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-78b-1t1c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-features"></a>
+    <a name="78b-2t2c-base-ixgbe"></a>
+    <a name="78b-2t2c-scale-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/cpta-ip4-feature-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-78b-2t2c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-features"></a>
+    <a name="78b-4t4c-base-ixgbe"></a>
+    <a name="78b-4t4c-scale-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/cpta-ip4-feature-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-78b-4t4c-ip6-base-scale-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 4a530c747f..938368067d 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -3,13 +3,13 @@ IPv6 Routing
 
 .. toctree::
 
-    ip6-3n-hsw-x520-78b-base-scale
-    ip6-3n-hsw-x710-78b-base-scale
-    ip6-3n-hsw-xl710-78b-base-scale
-    ip6-3n-skx-x710-78b-base-scale
-    ip6-3n-skx-xxv710-78b-base-scale
-    ip6-2n-skx-x710-78b-base-scale
-    ip6-2n-skx-xxv710-78b-base-scale
-    ip6-3n-tsh-x520-78b-base-scale
-    ip6-3n-dnv-x553-78b-base-scale
-    ip6-2n-dnv-x553-78b-base-scale
+    ip6-2n-skx-xxv710
+    ip6-2n-skx-x710
+    ip6-3n-skx-xxv710
+    ip6-3n-skx-x710
+    ip6-3n-hsw-xl710
+    ip6-3n-tsh-x520
+    ip6-2n-dnv-x553
+    ip6-3n-dnv-x553
+    ip6-2n-clx-xxv710
+    ip6-2n-clx-x710
diff --git a/docs/cpta/trending/l2-3n-dnv-x553-64b-base-scale.rst b/docs/cpta/trending/ipsec-3n-dnv-x553.rst
index 9230c43985..14cc53bd5c 100644
--- a/docs/cpta/trending/l2-3n-dnv-x553-64b-base-scale.rst
+++ b/docs/cpta/trending/ipsec-3n-dnv-x553.rst
@@ -1,44 +1,58 @@
-3n-dnv-x553-64b-base-scale
---------------------------
+3n-dnv-x553
+-----------
+
+imix-ipsec-ip4routing-base-scale-sw-ixgbe
+`````````````````````````````````````````
+
+..
+    10ge2p1x553-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
+    10ge2p1x553-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+    10ge2p1x553-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
+    10ge2p1x553-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+    10ge2p1x553-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
+    10ge2p1x553-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-1t1c-base-scale"></a>
+    <a name="imix-1t1c-base-sw-ixgbe"></a>
+    <a name="imix-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-imix-1t1c-ipsec-base-scale-sw-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-2t2c-base-scale"></a>
+    <a name="imix-2t2c-base-sw-ixgbe"></a>
+    <a name="imix-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-imix-2t2c-ipsec-base-scale-sw-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-4t4c-base-scale"></a>
+    <a name="imix-4t4c-base-sw-ixgbe"></a>
+    <a name="imix-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-imix-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ipsec-3n-hsw-xl710.rst b/docs/cpta/trending/ipsec-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..41971bafee
--- /dev/null
+++ b/docs/cpta/trending/ipsec-3n-hsw-xl710.rst
@@ -0,0 +1,112 @@
+3n-hsw-xl710
+------------
+
+imix-ipsec-ip4routing-base-scale-sw-i40e
+````````````````````````````````````````
+
+..
+    40ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
+    40ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+    40ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
+    40ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+    40ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
+    40ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-sw-i40e"></a>
+    <a name="imix-1t1c-scale-sw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-imix-1t1c-ipsec-base-scale-sw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t2c-base-sw-i40e"></a>
+    <a name="imix-2t2c-scale-sw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-imix-2t2c-ipsec-base-scale-sw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t4c-base-sw-i40e"></a>
+    <a name="imix-4t4c-scale-sw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-imix-4t4c-ipsec-base-scale-sw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+imix-ipsec-ip4routing-base-scale-hw-i40e
+````````````````````````````````````````
+
+..
+    40ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr
+    40ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr
+    40ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr
+    40ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-hw-i40e"></a>
+    <a name="imix-1t1c-scale-hw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-imix-1t1c-ipsec-base-scale-hw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t2c-base-hw-i40e"></a>
+    <a name="imix-2t2c-scale-hw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-imix-2t2c-ipsec-base-scale-hw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t4c-base-hw-i40e"></a>
+    <a name="imix-4t4c-scale-hw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-imix-4t4c-ipsec-base-scale-hw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsec-3n-skx-xxv710.rst b/docs/cpta/trending/ipsec-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..57be69aa22
--- /dev/null
+++ b/docs/cpta/trending/ipsec-3n-skx-xxv710.rst
@@ -0,0 +1,58 @@
+3n-skx-xxv710
+-------------
+
+imix-ipsec-ip4routing-base-scale-sw-i40e
+````````````````````````````````````````
+
+..
+    25ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
+    25ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+    25ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
+    25ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+    25ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
+    25ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-i40e"></a>
+    <a name="imix-2t1c-scale-sw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t2c-base-sw-i40e"></a>
+    <a name="imix-4t2c-scale-sw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-4t2c-ipsec-base-scale-sw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-8t4c-base-sw-i40e"></a>
+    <a name="imix-8t4c-scale-sw-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-8t4c-ipsec-base-scale-sw-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsec-3n-tsh-x520.rst b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
new file mode 100644
index 0000000000..fd1f76feec
--- /dev/null
+++ b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
@@ -0,0 +1,58 @@
+3n-tsh-x520
+-----------
+
+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
+::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-sw-ixgbe"></a>
+    <a name="imix-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-imix-1t1c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t2c-base-sw-ixgbe"></a>
+    <a name="imix-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-imix-2t2c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t4c-base-sw-ixgbe"></a>
+    <a name="imix-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-imix-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst
index bb911f12bc..602199b7bd 100644
--- a/docs/cpta/trending/ipsec.rst
+++ b/docs/cpta/trending/ipsec.rst
@@ -3,7 +3,7 @@ IPSec IPv4 Routing
 
 .. toctree::
 
-    ipsecsw-3n-hsw-x710-64b-base-scale
-    ipsecsw-3n-skx-x710-64b-base-scale
-    ipsecsw-3n-tsh-x520-64b-base-scale
-    ipsechw-3n-dnv-x553-64b-base-scale
+    ipsec-3n-skx-xxv710
+    ipsec-3n-hsw-xl710
+    ipsec-3n-tsh-x520
+    ipsec-3n-dnv-x553
diff --git a/docs/cpta/trending/l2-2n-clx-x710.rst b/docs/cpta/trending/l2-2n-clx-x710.rst
new file mode 100644
index 0000000000..8348937ee3
--- /dev/null
+++ b/docs/cpta/trending/l2-2n-clx-x710.rst
@@ -0,0 +1,64 @@
+2n-clx-x710
+-----------
+
+64b-l2switching-base-scale-avf-i40e
+```````````````````````````````````
+
+..
+    2n1l-10ge2p1x710-avf-eth-l2xcbase-mrr
+    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-2n-clx-xxv710.rst b/docs/cpta/trending/l2-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..333dbaf754
--- /dev/null
+++ b/docs/cpta/trending/l2-2n-clx-xxv710.rst
@@ -0,0 +1,157 @@
+2n-clx-xxv710
+-------------
+
+64b-l2switching-base-avf
+````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-avf-eth-l2patch-mrr
+    2n1l-25ge2p1xxv710-avf-eth-l2xcbase-mrr
+    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-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-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-l2-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. 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-l2-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-i40e
+`````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2patch-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2xcbase-mrr
+    2n1l-25ge2p1xxv710-eth-l2xcbase-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-l2-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-l2-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-l2-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-i40e
+```````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdscale10kmaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdscale100kmaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdscale1mmaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-2n-dnv-x553-64b-base-scale.rst b/docs/cpta/trending/l2-2n-dnv-x553-64b-base-scale.rst
deleted file mode 100644
index b3f34e8864..0000000000
--- a/docs/cpta/trending/l2-2n-dnv-x553-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-dnv-x553-64b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x553-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x553-2n-dnv.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x553-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x553-2n-dnv.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x553-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x553-2n-dnv.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-2n-dnv-x553.rst b/docs/cpta/trending/l2-2n-dnv-x553.rst
new file mode 100644
index 0000000000..b1ed91f9d1
--- /dev/null
+++ b/docs/cpta/trending/l2-2n-dnv-x553.rst
@@ -0,0 +1,109 @@
+2n-dnv-x553
+-----------
+
+64b-l2switching-base-ixgbe
+``````````````````````````
+
+..
+    10ge2p1x553-dot1q-l2xcbase-mrr
+    10ge2p1x553-eth-l2xcbase-mrr
+    10ge2p1x553-dot1q-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-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-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-1t1c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-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-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-2t2c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-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-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-4t4c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-ixgbe
+````````````````````````````````
+
+..
+    10ge2p1x553-eth-l2patch-mrr
+    10ge2p1x553-eth-l2xcbase-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdscale10kmaclrn-mrr
+    10ge2p1x553-eth-l2bdscale100kmaclrn-mrr
+    10ge2p1x553-eth-l2bdscale1mmaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-2t2c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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-2n-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-dnv-x553-64b-4t4c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
deleted file mode 100644
index f0b50f5c30..0000000000
--- a/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b-base-scale
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst b/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
deleted file mode 100644
index d69aa34777..0000000000
--- a/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b-features
-------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-8t4c-x710-2n-skx.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
new file mode 100644
index 0000000000..44fdf86b52
--- /dev/null
+++ b/docs/cpta/trending/l2-2n-skx-x710.rst
@@ -0,0 +1,64 @@
+2n-skx-x710
+-----------
+
+64b-l2switching-base-scale-avf-i40e
+```````````````````````````````````
+
+..
+    2n1l-10ge2p1x710-avf-eth-l2xcbase-mrr
+    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-mrr
+    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
deleted file mode 100644
index d74ed54ef7..0000000000
--- a/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-base-scale
-----------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst b/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
deleted file mode 100644
index 6a87093208..0000000000
--- a/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-features
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-2n-skx-xxv710.rst b/docs/cpta/trending/l2-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..b5ffe52d8f
--- /dev/null
+++ b/docs/cpta/trending/l2-2n-skx-xxv710.rst
@@ -0,0 +1,157 @@
+2n-skx-xxv710
+-------------
+
+64b-l2switching-base-avf
+````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-avf-eth-l2patch-mrr
+    2n1l-25ge2p1xxv710-avf-eth-l2xcbase-mrr
+    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-64b-2t1c-l2-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-64b-4t2c-l2-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. 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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-8t4c-l2-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-i40e
+`````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2patch-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2xcbase-mrr
+    2n1l-25ge2p1xxv710-eth-l2xcbase-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t1c-l2-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t2c-l2-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-8t4c-l2-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-i40e
+```````````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdscale10kmaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdscale100kmaclrn-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdscale1mmaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t1c-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t2c-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-8t4c-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-dnv-x553.rst b/docs/cpta/trending/l2-3n-dnv-x553.rst
new file mode 100644
index 0000000000..11846cf611
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-dnv-x553.rst
@@ -0,0 +1,162 @@
+3n-dnv-x553
+-----------
+
+64b-l2switching-base-ixgbe
+``````````````````````````
+
+..
+    10ge2p1x553-dot1q-l2xcbase-mrr
+    10ge2p1x553-eth-l2xcbase-mrr
+    10ge2p1x553-dot1q-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-1t1c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-2t2c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-4t4c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-ixgbe
+````````````````````````````````
+
+..
+    10ge2p1x553-eth-l2patch-mrr
+    10ge2p1x553-eth-l2xcbase-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdscale10kmaclrn-mrr
+    10ge2p1x553-eth-l2bdscale100kmaclrn-mrr
+    10ge2p1x553-eth-l2bdscale1mmaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-2t2c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-4t4c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-features-l2switching-base-ixgbe
+```````````````````````````````````
+
+..
+    10ge2p1x553-eth-l2bdbasemaclrn-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr
+    10ge2p1x553-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-features-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-1t1c-l2-features-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-features-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-2t2c-l2-features-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-features-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-dnv" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-64b-4t4c-l2-features-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
deleted file mode 100644
index a59db0375e..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-vic1227-64b-base
------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="vic1227-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-1t1c-vic1227-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="vic1227-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t2c-vic1227-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="vic1227-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t4c-vic1227-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
deleted file mode 100644
index 201fa24ef3..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-vic1385-64b-base
------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="vic1385-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-1t1c-vic1385-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="vic1385-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t2c-vic1385-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="vic1385-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t4c-vic1385-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
deleted file mode 100644
index 2e8b29c364..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
deleted file mode 100644
index b81d5a8faa..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-features-iacl
------------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-features-iacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-1t1c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-features-iacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t2c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-features-iacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t4c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
deleted file mode 100644
index e9bd107c69..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-features-macip
-------------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-features-macip"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-1t1c-x520-3n-hsw-macip.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-features-macip"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t2c-x520-3n-hsw-macip.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-features-macip"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t4c-x520-3n-hsw-macip.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
deleted file mode 100644
index 90f95544a4..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-features-oacl
------------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-features-oacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-1t1c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-features-oacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t2c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-features-oacl"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t4c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
deleted file mode 100644
index 78b33c88bb..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst b/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
deleted file mode 100644
index 89167653c3..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-features
-------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
deleted file mode 100644
index 7996fcc095..0000000000
--- a/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-64b-base-scale
----------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-xl710.rst b/docs/cpta/trending/l2-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..10fc00662e
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-hsw-xl710.rst
@@ -0,0 +1,58 @@
+3n-hsw-xl710
+------------
+
+64b-l2switching-base-scale-i40e
+```````````````````````````````
+
+..
+    40ge2p1xl710-eth-l2patch-mrr
+    40ge2p1xl710-dot1q-l2xcbase-mrr
+    40ge2p1xl710-eth-l2xcbase-mrr
+    40ge2p1xl710-dot1q-l2bdbasemaclrn-mrr
+    40ge2p1xl710-eth-l2bdbasemaclrn-mrr
+    40ge2p1xl710-eth-l2bdscale1mmaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-i40e"></a>
+    <a name="64b-1t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-64b-1t1c-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-i40e"></a>
+    <a name="64b-2t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-64b-2t2c-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-i40e"></a>
+    <a name="64b-4t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-xl710-64b-4t4c-l2-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
deleted file mode 100644
index 79dd251bff..0000000000
--- a/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b-base-scale
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst b/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
deleted file mode 100644
index 890a81ce01..0000000000
--- a/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b-features
-------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-skx-x710.rst b/docs/cpta/trending/l2-3n-skx-x710.rst
new file mode 100644
index 0000000000..6cffb9328b
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-skx-x710.rst
@@ -0,0 +1,64 @@
+3n-skx-x710
+-----------
+
+64b-l2switching-base-scale-avf-i40e
+```````````````````````````````````
+
+..
+    10ge2p1x710-avf-eth-l2patch-mrr
+    10ge2p1x710-avf-eth-l2xcbase-mrr
+    10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-mrr
+    10ge2p1x710-eth-l2bdbasemaclrn-mrr
+    10ge2p1x710-eth-l2bdscale1mmaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-2t1c-l2-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-4t2c-l2-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-base-avf"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-8t4c-l2-base-scale-avf-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
deleted file mode 100644
index 64be4ff5ea..0000000000
--- a/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-base-scale
-----------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst b/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
deleted file mode 100644
index 8fe71c8bb1..0000000000
--- a/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-features
---------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-features"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-feature-8t4c-xxv710-3n-skx.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
new file mode 100644
index 0000000000..8f2c49d701
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-skx-xxv710.rst
@@ -0,0 +1,212 @@
+3n-skx-xxv710
+-------------
+
+64b-l2switching-base-avf
+````````````````````````
+
+..
+    25ge2p1xxv710-avf-eth-l2patch-mrr
+    25ge2p1xxv710-avf-eth-l2xcbase-mrr
+    25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-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-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-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-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. 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-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-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-i40e
+`````````````````````````
+
+..
+    25ge2p1xxv710-dot1q-l2xcbase-mrr
+    25ge2p1xxv710-eth-l2xcbase-mrr
+    25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-i40e
+```````````````````````````````
+
+..
+    25ge2p1xxv710-eth-l2patch-mrr
+    25ge2p1xxv710-eth-l2xcbase-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+    25ge2p1xxv710-eth-l2bdscale10kmaclrn-mrr
+    25ge2p1xxv710-eth-l2bdscale100kmaclrn-mrr
+    25ge2p1xxv710-eth-l2bdscale1mmaclrn-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e"></a>
+    <a name="64b-2t1c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e"></a>
+    <a name="64b-4t2c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e"></a>
+    <a name="64b-8t4c-scale-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-base-scale-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-features-l2switching-base-i40e
+``````````````````````````````````
+
+..
+    25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-features-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-tsh-x520-64b-base-scale.rst b/docs/cpta/trending/l2-3n-tsh-x520-64b-base-scale.rst
deleted file mode 100644
index f726ca2aaa..0000000000
--- a/docs/cpta/trending/l2-3n-tsh-x520-64b-base-scale.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-tsh-x520-64b-base-scale
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-1t1c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-2t2c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base-scale"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-l2-4t4c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2-3n-tsh-x520.rst b/docs/cpta/trending/l2-3n-tsh-x520.rst
new file mode 100644
index 0000000000..416c3697b3
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-tsh-x520.rst
@@ -0,0 +1,162 @@
+3n-tsh-x520
+-----------
+
+64b-l2switching-base-ixgbe
+``````````````````````````
+
+..
+    10ge2p1x520-dot1q-l2xcbase-mrr
+    10ge2p1x520-eth-l2xcbase-mrr
+    10ge2p1x520-dot1q-l2bdbasemaclrn-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-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-64b-1t1c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-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-64b-2t2c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-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-64b-4t4c-l2-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-ixgbe
+````````````````````````````````
+
+..
+    10ge2p1x520-eth-l2patch-mrr
+    10ge2p1x520-eth-l2xcbase-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-mrr
+    10ge2p1x520-eth-l2bdscale10kmaclrn-mrr
+    10ge2p1x520-eth-l2bdscale100kmaclrn-mrr
+    10ge2p1x520-eth-l2bdscale1mmaclrn-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-ixgbe"></a>
+    <a name="64b-1t1c-scale-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-64b-1t1c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-ixgbe"></a>
+    <a name="64b-2t2c-scale-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-64b-2t2c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-ixgbe"></a>
+    <a name="64b-4t4c-scale-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-64b-4t4c-l2-base-scale-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-features-l2switching-base-ixgbe
+```````````````````````````````````
+
+..
+    10ge2p1x520-eth-l2bdbasemaclrn-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-features-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-64b-1t1c-l2-features-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-features-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-64b-2t2c-l2-features-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-features-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-64b-4t4c-l2-features-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index 050133bcfb..d16fe604c1 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -3,20 +3,13 @@ L2 Ethernet Switching
 
 .. toctree::
 
-    l2-3n-hsw-x520-64b-base-scale
-    l2-3n-hsw-x520-64b-features-iacl
-    l2-3n-hsw-x520-64b-features-oacl
-    l2-3n-hsw-x520-64b-features-macip
-    l2-3n-hsw-x710-64b-base-scale
-    l2-3n-hsw-x710-64b-features
-    l2-3n-hsw-xl710-64b-base-scale
-    l2-3n-skx-x710-64b-base-scale
-    l2-3n-skx-x710-64b-features
-    l2-3n-skx-xxv710-64b-base-scale
-    l2-2n-skx-x710-64b-base-scale
-    l2-2n-skx-xxv710-64b-base-scale
-    l2-3n-hsw-vic1227-64b-base-scale
-    l2-3n-hsw-vic1385-64b-base-scale
-    l2-3n-tsh-x520-64b-base-scale
-    l2-3n-dnv-x553-64b-base-scale
-    l2-2n-dnv-x553-64b-base-scale
+    l2-2n-skx-xxv710
+    l2-2n-skx-x710
+    l2-3n-skx-xxv710
+    l2-3n-skx-x710
+    l2-3n-hsw-xl710
+    l2-3n-tsh-x520
+    l2-2n-dnv-x553
+    l2-3n-dnv-x553
+    l2-2n-clx-xxv710
+    l2-2n-clx-x710
diff --git a/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst b/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
deleted file mode 100644
index 877e2907ae..0000000000
--- a/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b
----------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst b/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
deleted file mode 100644
index 37a09960a2..0000000000
--- a/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-imix
-----------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst b/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
deleted file mode 100644
index 1b3e563736..0000000000
--- a/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b
----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst b/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
deleted file mode 100644
index 3826bc680e..0000000000
--- a/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-imix
-----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst b/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
deleted file mode 100644
index 19fabf8666..0000000000
--- a/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b
----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst b/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
deleted file mode 100644
index e285a5a45a..0000000000
--- a/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-imix
-----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst b/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
deleted file mode 100644
index cc7a2ac951..0000000000
--- a/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b
----------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst b/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
deleted file mode 100644
index 7313d22b8b..0000000000
--- a/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-imix
-----------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-8t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-imix-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding-3n-tsh-x520-64b.rst b/docs/cpta/trending/link_bonding-3n-tsh-x520-64b.rst
deleted file mode 100644
index 7b2e7d73ad..0000000000
--- a/docs/cpta/trending/link_bonding-3n-tsh-x520-64b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-tsh-x520-64b
----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-1t1c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-2t2c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-lb-64b-4t4c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/link_bonding.rst b/docs/cpta/trending/link_bonding.rst
deleted file mode 100644
index afe65cbb9d..0000000000
--- a/docs/cpta/trending/link_bonding.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-Link Bonding
-============
-
-.. toctree::
-
-    link_bonding-3n-hsw-x520-64b
-    link_bonding-3n-hsw-x520-imix
-    link_bonding-3n-hsw-x710-64b
-    link_bonding-3n-hsw-x710-imix
-    link_bonding-3n-skx-x710-64b
-    link_bonding-3n-skx-x710-imix
-    link_bonding-3n-tsh-x520-64b
diff --git a/docs/cpta/trending/nf_service_density.rst b/docs/cpta/trending/nf_service_density.rst
index 7b3341b0f9..c8aa15f0e3 100644
--- a/docs/cpta/trending/nf_service_density.rst
+++ b/docs/cpta/trending/nf_service_density.rst
@@ -4,6 +4,6 @@ NF Service Density
 
 .. toctree::
 
-    nf_service_density_vnfc-eth-l2bd-2n-skx-x710-64b
-    nf_service_density_cnfc-eth-l2bd-2n-skx-x710-64b
-    nf_service_density_cnfp-eth-l2bd-2n-skx-x710-64b
+    nf_service_density_vnfc-2n-skx-xxv710
+    nf_service_density_cnfc-2n-skx-xxv710
+    nf_service_density_cnfp-2n-skx-xxv710
diff --git a/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst b/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..526e531ecb
--- /dev/null
+++ b/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst
@@ -0,0 +1,72 @@
+CNF Service Chains
+------------------
+
+2n-skx-xxv710-imix-memif-chains-i40e
+````````````````````````````````````
+
+..
+    2n-25ge2p1xxv710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-2t1c-memif-chains-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t2c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-4t2c-memif-chains-i40e.html.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-8t4c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-8t4c-memif-chains-i40e.html.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/nf_service_density_cnfc-eth-l2bd-2n-skx-x710-64b.rst b/docs/cpta/trending/nf_service_density_cnfc-eth-l2bd-2n-skx-x710-64b.rst
deleted file mode 100644
index 2681ba663a..0000000000
--- a/docs/cpta/trending/nf_service_density_cnfc-eth-l2bd-2n-skx-x710-64b.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-CNF Service Chains
-------------------
-
-2n-skx-x710-64b-eth-l2bd
-````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-cnfc-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-cnfc-eth-l2bd-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
-    Links to builds:
-    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-cnfc-eth-l2bd-64b-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-cnfc-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-cnfc-eth-l2bd-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
-    Links to builds:
-    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-cnfc-eth-l2bd-64b-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-cnfc-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-cnfc-eth-l2bd-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
-    Links to builds:
-    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-cnfc-eth-l2bd-64b-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
-    </center>
diff --git a/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst b/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..41b48c6ee7
--- /dev/null
+++ b/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst
@@ -0,0 +1,72 @@
+CNF Service Pipelines
+---------------------
+
+2n-skx-xxv710-imix-memif-pipelines-i40e
+```````````````````````````````````````
+
+..
+    2n-25ge2p1xxv710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-mrr
+    2n-25ge2p1xxv710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-2t1c-memif-pipelines-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t2c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-4t2c-memif-pipelines-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-8t4c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-8t4c-memif-pipelines-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/nf_service_density_cnfp-eth-l2bd-2n-skx-x710-64b.rst b/docs/cpta/trending/nf_service_density_cnfp-eth-l2bd-2n-skx-x710-64b.rst
deleted file mode 100644
index 2492d75c35..0000000000
--- a/docs/cpta/trending/nf_service_density_cnfp-eth-l2bd-2n-skx-x710-64b.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-CNF Service Pipelines
----------------------
-
-2n-skx-x710-64b-eth-l2bd
-````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-cnfp-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-cnfp-eth-l2bd-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
-    Links to builds:
-    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-cnfp-eth-l2bd-64b-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-cnfp-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-cnfp-eth-l2bd-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
-    Links to builds:
-    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-cnfp-eth-l2bd-64b-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-cnfp-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-cnfp-eth-l2bd-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
-    Links to builds:
-    <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-cnfp-eth-l2bd-64b-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
-    </center>
diff --git a/docs/cpta/trending/nf_service_density_vnfc-eth-l2bd-2n-skx-x710-64b.rst b/docs/cpta/trending/nf_service_density_vnfc-2n-skx-xxv710.rst
index 4093e7a01f..dae254ee08 100644
--- a/docs/cpta/trending/nf_service_density_vnfc-eth-l2bd-2n-skx-x710-64b.rst
+++ b/docs/cpta/trending/nf_service_density_vnfc-2n-skx-xxv710.rst
@@ -1,26 +1,20 @@
 VNF Service Chains
 ------------------
 
-2n-skx-x710-64b-eth-l2bd
-````````````````````````
+2n-skx-xxv710-imix-vhost-chains-i40e
+````````````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-vnfc-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-vnfc-eth-l2bd-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <a name="imix-2t1c-base-i40e"></a>
+    <center>
     Links to builds:
     <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vnfc-eth-l2bd-64b-2t1c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-2t1c-vhost-chains-i40e.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -29,18 +23,12 @@ VNF Service Chains
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-vnfc-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-vnfc-eth-l2bd-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <a name="imix-4t2c-base-i40e"></a>
+    <center>
     Links to builds:
     <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vnfc-eth-l2bd-64b-4t2c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-4t2c-vhost-chains-i40e.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -49,17 +37,11 @@ VNF Service Chains
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-vnfc-eth-l2bd"></a>
-    <center><b>
-
-:index:`2n-skx-x710-vnfc-eth-l2bd-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <a name="imix-8t4c-base-i40e"></a>
+    <center>
     Links to builds:
     <a href="https://packagecloud.io/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-weekly-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vnfc-eth-l2bd-64b-8t4c-x710-2n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-8t4c-vhost-chains-i40e.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-dnv-x553-64b-base.rst b/docs/cpta/trending/srv6-3n-dnv-x553.rst
index b949e8045a..9ce12410ed 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-dnv-x553-64b-base.rst
+++ b/docs/cpta/trending/srv6-3n-dnv-x553.rst
@@ -1,44 +1,55 @@
-3n-dnv-x553-64b-base
---------------------
+3n-dnv-x553
+-----------
+
+78b-srv6-ip6routing-base-ixgbe
+``````````````````````````````
+
+..
+    10ge2p1x553-ethip6ip6-ip6base-srv6enc1sid-mrr
+    10ge2p1x553-ethip6srhip6-ip6base-srv6enc2sids-mrr
+    10ge2p1x553-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+    10ge2p1x553-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+    10ge2p1x553-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+    10ge2p1x553-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-1t1c-base"></a>
+    <a name="78b-1t1c-base-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-78b-1t1c-srv6-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-2t2c-base"></a>
+    <a name="78b-2t2c-base-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-78b-2t2c-srv6-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x553-64b-4t4c-base"></a>
+    <a name="78b-4t4c-base-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-dnv" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x553-3n-dnv.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-dnv-x553-78b-4t4c-srv6-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst b/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
deleted file mode 100644
index ce313fcc54..0000000000
--- a/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-78b
----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-78b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-srv6-78b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-78b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-srv6-78b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-78b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-srv6-78b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst b/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
deleted file mode 100644
index ae5ac6d978..0000000000
--- a/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-imix
-----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-srv6-imix-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-srv6-imix-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-srv6-imix-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/srv6-3n-hsw-xl710.rst b/docs/cpta/trending/srv6-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..1794c8d209
--- /dev/null
+++ b/docs/cpta/trending/srv6-3n-hsw-xl710.rst
@@ -0,0 +1,55 @@
+3n-hsw-xl710
+------------
+
+78b-srv6-ip6routing-base-i40e
+`````````````````````````````
+
+..
+    40ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-mrr
+    40ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-mrr
+    40ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+    40ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+    40ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+    40ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="78b-1t1c-base-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" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="78b-2t2c-base-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" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-2t2c-srv6-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="78b-4t4c-base-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" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-4t4c-srv6-base-i40e.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst b/docs/cpta/trending/srv6-3n-skx-xxv710.rst
index 27295a6d5c..8640c2de94 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/srv6-3n-skx-xxv710.rst
@@ -1,44 +1,55 @@
-3n-skx-x710-64b-base
---------------------
+3n-skx-xxv710
+-------------
+
+78b-srv6-ip6routing-base-i40e
+`````````````````````````````
+
+..
+    25ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-mrr
+    25ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-mrr
+    25ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+    25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+    25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+    25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t1c-base"></a>
+    <a name="78b-2t1c-base-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t1c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t2c-base"></a>
+    <a name="78b-4t2c-base-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t2c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-4t2c-srv6-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-8t4c-base"></a>
+    <a name="78b-8t4c-base-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-8t4c-x710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-8t4c-srv6-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-tsh-x520-78b-base-scale.rst b/docs/cpta/trending/srv6-3n-tsh-x520.rst
index d1e8dd6019..aff2a6be36 100644
--- a/docs/cpta/trending/ip6-3n-tsh-x520-78b-base-scale.rst
+++ b/docs/cpta/trending/srv6-3n-tsh-x520.rst
@@ -1,44 +1,55 @@
-3n-tsh-x520-78b-base-scale
---------------------------
+3n-tsh-x520
+-----------
+
+78b-srv6-ip6routing-base-ixgbe
+``````````````````````````````
+
+..
+    10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr
+    10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr
+    10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+    10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+    10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+    10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-78b-1t1c-base-scale"></a>
+    <a name="78b-1t1c-base-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/cpta-ip6-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-78b-2t2c-base-scale"></a>
+    <a name="78b-2t2c-base-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/cpta-ip6-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-78b-2t2c-srv6-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-78b-4t4c-base-scale"></a>
+    <a name="78b-4t4c-base-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/cpta-ip6-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-78b-4t4c-srv6-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst
index b4f3f330e1..8625de35a2 100644
--- a/docs/cpta/trending/srv6.rst
+++ b/docs/cpta/trending/srv6.rst
@@ -3,7 +3,7 @@ SRv6 Routing
 
 .. toctree::
 
-    srv6-3n-hsw-x520-78b
-
-..
-    srv6-3n-hsw-x520-imix
+    srv6-3n-skx-xxv710
+    srv6-3n-hsw-xl710
+    srv6-3n-tsh-x520
+    srv6-3n-dnv-x553
diff --git a/docs/cpta/trending/vhost-2n-clx-xxv710.rst b/docs/cpta/trending/vhost-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..5e949dea8b
--- /dev/null
+++ b/docs/cpta/trending/vhost-2n-clx-xxv710.rst
@@ -0,0 +1,104 @@
+2n-clx-xxv710
+-------------
+
+64b-vhost-base-i40e-testpmd
+```````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-i40e-vpp
+```````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/vhost-2n-skx-xxv710.rst b/docs/cpta/trending/vhost-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..99157836b8
--- /dev/null
+++ b/docs/cpta/trending/vhost-2n-skx-xxv710.rst
@@ -0,0 +1,104 @@
+2n-skx-xxv710
+-------------
+
+64b-vhost-base-i40e-testpmd
+```````````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t1c-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t2c-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-8t4c-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-i40e-vpp
+```````````````````````
+
+..
+    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t1c-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t2c-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-8t4c-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/ipsecsw-3n-hsw-x710-64b-base-scale.rst b/docs/cpta/trending/vhost-3n-hsw-xl710.rst
index 4b4cd35c97..c6b272e817 100644
--- a/docs/cpta/trending/ipsecsw-3n-hsw-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/vhost-3n-hsw-xl710.rst
@@ -1,89 +1,104 @@
-3n-hsw-x710-64b-base-scale-sw-int
----------------------------------
+3n-hsw-xl710
+------------
+
+64b-vhost-base-i40e-testpmd
+```````````````````````````
+
+..
+    40ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    40ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    40ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-1t1c-base-scale-int"></a>
+    <a name="64b-1t1c-base-i40e-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ipsecsw-int-1t1c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t2c-base-scale-int"></a>
+    <a name="64b-2t2c-base-i40e-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ipsecsw-int-2t2c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-2t2c-vhost-base-i40e-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t4c-base-scale-int"></a>
+    <a name="64b-4t4c-base-i40e-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ipsecsw-int-4t4c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-4t4c-vhost-base-i40e-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
-3n-hsw-x710-64b-base-scale-sw-tnl
----------------------------------
+64b-vhost-base-i40e-vpp
+```````````````````````
+
+..
+    40ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    40ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    40ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-1t1c-base-scale-tnl"></a>
+    <a name="64b-1t1c-base-i40e-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ipsecsw-tnl-1t1c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t2c-base-scale-tnl"></a>
+    <a name="-64b-2t2c-base-i40e-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ipsecsw-tnl-2t2c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-2t2c-vhost-base-i40e-vpp.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t4c-base-scale-tnl"></a>
+    <a name="64b-4t4c-base-i40e-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-ipsecsw-tnl-4t4c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-4t4c-vhost-base-i40e-vpp.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vhost-3n-skx-x710.rst b/docs/cpta/trending/vhost-3n-skx-x710.rst
new file mode 100644
index 0000000000..a097df0783
--- /dev/null
+++ b/docs/cpta/trending/vhost-3n-skx-x710.rst
@@ -0,0 +1,108 @@
+3n-skx-x710
+-----------
+
+64b-link-bonding-vhost-base-i40e-testpmd
+````````````````````````````````````````
+
+..
+    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-2t1c-link-bonding-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-link-bonding-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-4t2c-link-bonding-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-link-bonding-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-8t4c-link-bonding-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-i40e-vpp
+````````````````````````````````````
+
+..
+    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-link-bonding-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-4t2c-link-bonding-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-link-bonding-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-x710-64b-8t4c-link-bonding-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/vhost-3n-skx-xxv710.rst b/docs/cpta/trending/vhost-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..1d4b5c2760
--- /dev/null
+++ b/docs/cpta/trending/vhost-3n-skx-xxv710.rst
@@ -0,0 +1,212 @@
+3n-skx-xxv710
+-------------
+
+64b-vhost-base-i40e-testpmd
+```````````````````````````
+
+..
+    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-i40e-vpp
+```````````````````````
+
+..
+    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-i40e-testpmd
+````````````````````````````````````````
+
+..
+    25ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-link-bonding-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-link-bonding-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-link-bonding-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-link-bonding-i40e-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-link-bonding-vhost-base-i40e-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-i40e-vpp
+````````````````````````````````````
+
+..
+    25ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-link-bonding-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-link-bonding-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-link-bonding-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-link-bonding-i40e-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-link-bonding-vhost-base-i40e-vpp.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/vhost-3n-tsh-x520.rst b/docs/cpta/trending/vhost-3n-tsh-x520.rst
new file mode 100644
index 0000000000..43ae073d76
--- /dev/null
+++ b/docs/cpta/trending/vhost-3n-tsh-x520.rst
@@ -0,0 +1,107 @@
+3n-tsh-x520
+-----------
+
+64b-vhost-base-ixgbe
+````````````````````
+
+..
+    10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-ixgbe-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-1t1c-vhost-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-ixgbe-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t2c-vhost-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-ixgbe-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t4c-vhost-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-ixgbe
+`````````````````````````````````
+
+..
+    10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+    10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-1t1c-base-link-bonding-ixgbe-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-1t1c-link-bonding-vhost-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t2c-base-link-bonding-ixgbe-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-2t2c-link-bonding-vhost-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t4c-base-link-bonding-ixgbe-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-64b-4t4c-link-bonding-vhost-base-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/vhost.rst b/docs/cpta/trending/vhost.rst
new file mode 100644
index 0000000000..25ace2eb3e
--- /dev/null
+++ b/docs/cpta/trending/vhost.rst
@@ -0,0 +1,11 @@
+VMs vhost-user
+==============
+
+.. toctree::
+
+    vhost-2n-skx-xxv710
+    vhost-3n-skx-xxv710
+    vhost-3n-skx-x710
+    vhost-3n-hsw-xl710
+    vhost-3n-tsh-x520
+    vhost-2n-clx-xxv710
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst
deleted file mode 100644
index 35d776fd5a..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b-base
---------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst
deleted file mode 100644
index bd6102efa1..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-imix-base
----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst
deleted file mode 100644
index 4e871cc00d..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-base
-----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst
deleted file mode 100644
index 0734c637fd..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-imix-base
------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst
deleted file mode 100644
index 12293af877..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst
deleted file mode 100644
index 93a2bf99b8..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-imix-base
----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst
deleted file mode 100644
index 12821b6386..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst
deleted file mode 100644
index 8fa54f57e2..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-imix-base
----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst
deleted file mode 100644
index b641b076e3..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-imix-base
----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst
deleted file mode 100644
index 33bbe389cc..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-base
-----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst
deleted file mode 100644
index f096a9b924..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-imix-base
------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-tsh-x520-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-tsh-x520-64b-base.rst
deleted file mode 100644
index 2b0efefdae..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4-3n-tsh-x520-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-tsh-x520-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-1t1c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-2t2c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-ethip4-4t4c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4.rst b/docs/cpta/trending/vm_vhost_ip4.rst
deleted file mode 100644
index 7d32719828..0000000000
--- a/docs/cpta/trending/vm_vhost_ip4.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-IPv4 VMs vhost-user
-===================
-
-.. toctree::
-
-    vm_vhost_ip4-3n-hsw-x520-64b-base
-    vm_vhost_ip4-3n-hsw-x710-64b-base
-    vm_vhost_ip4-3n-hsw-x520-imix-base
-    vm_vhost_ip4-3n-hsw-x710-imix-base
-    vm_vhost_ip4-3n-skx-x710-64b-base
-    vm_vhost_ip4-3n-skx-x710-imix-base
-    vm_vhost_ip4-2n-skx-x710-64b-base
-    vm_vhost_ip4-2n-skx-x710-imix-base
-    vm_vhost_ip4-3n-tsh-x520-64b-base
-
-..
-    vm_vhost_ip4-2n-skx-xxv710-64b-base
-    vm_vhost_ip4-2n-skx-xxv710-imix-base
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst
deleted file mode 100644
index 70d85bf45f..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-64b-base
---------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst
deleted file mode 100644
index 7c25537db1..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-x710-imix-base
----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t1c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t2c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-8t4c-x710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst
deleted file mode 100644
index 27bd4b7bc3..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-64b-base
-----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst
deleted file mode 100644
index e9e43eb8df..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-2n-skx-xxv710-imix-base
------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
deleted file mode 100644
index 9a0155f998..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-base-l2bd
--------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base-l2bd"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-1t1c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base-l2bd"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t2c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base-l2bd"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t4c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
deleted file mode 100644
index 364e729c54..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-64b-base-l2xc
--------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base-l2xc"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-1t1c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base-l2xc"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t2c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base-l2xc"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t4c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
deleted file mode 100644
index ae04423531..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-imix-base-l2bd
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-1t1c-base-l2bd"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-2t2c-base-l2bd"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-4t4c-base-l2bd"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
deleted file mode 100644
index e82c3e28ba..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-imix-base-l2xc
---------------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-1t1c-base-l2xc"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-2t2c-base-l2xc"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-imix-4t4c-base-l2xc"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst
deleted file mode 100644
index ccaf59615c..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst
deleted file mode 100644
index 6ac89e7ceb..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x710-imix-base
----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst
deleted file mode 100644
index 6f1676ebea..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-64b-base
----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst
deleted file mode 100644
index 27caea64af..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-xl710-imix-base
-----------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="xl710-imix-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst
deleted file mode 100644
index c6ec04fa52..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-64b-base
---------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst
deleted file mode 100644
index 6e76931f3b..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-x710-imix-base
----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t1c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t2c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="x710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-8t4c-x710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst
deleted file mode 100644
index 26c225c155..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-64b-base
-----------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-64b-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst
deleted file mode 100644
index 802bb6afac..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-skx-xxv710-imix-base
------------------------
-
-2t1c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-2t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-4t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-````
-
-.. raw:: html
-
-    <a name="xxv710-imix-8t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-imix-eth-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-tsh-x520-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-tsh-x520-64b-base.rst
deleted file mode 100644
index 73c88175b7..0000000000
--- a/docs/cpta/trending/vm_vhost_l2-3n-tsh-x520-64b-base.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-tsh-x520-64b-base
---------------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-1t1c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-1t1c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-2t2c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-2t2c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-64b-4t4c-base"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vm-vhost-eth-4t4c-x520-3n-tsh.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst
deleted file mode 100644
index 1a63933bac..0000000000
--- a/docs/cpta/trending/vm_vhost_l2.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-L2 VMs vhost-user
-=================
-
-.. toctree::
-
-    vm_vhost_l2-3n-hsw-x520-64b-base-l2xc
-    vm_vhost_l2-3n-hsw-x520-64b-base-l2bd
-    vm_vhost_l2-3n-hsw-x710-64b-base
-    vm_vhost_l2-3n-hsw-x520-imix-base-l2xc
-    vm_vhost_l2-3n-hsw-x520-imix-base-l2bd
-    vm_vhost_l2-3n-hsw-x710-imix-base
-    vm_vhost_l2-3n-skx-x710-64b-base
-    vm_vhost_l2-3n-skx-x710-imix-base
-    vm_vhost_l2-2n-skx-x710-64b-base
-    vm_vhost_l2-2n-skx-x710-imix-base
-    vm_vhost_l2-3n-tsh-x520-64b-base
-
-..
-    vm_vhost_l2-2n-skx-xxv710-64b-base
-    vm_vhost_l2-2n-skx-xxv710-imix-base
-
-..
-    vm_vhost_l2-3n-hsw-xl710-64b-base
-    vm_vhost_l2-3n-hsw-xl710-imix-base
diff --git a/docs/cpta/trending/vts-3n-hsw-x520-114b.rst b/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
deleted file mode 100644
index 9730163d34..0000000000
--- a/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-3n-hsw-x520-114b
-----------------
-
-1t1c
-````
-
-.. raw:: html
-
-    <a name="x520-114b-1t1c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vts-114b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-````
-
-.. raw:: html
-
-    <a name="x520-114b-2t2c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vts-114b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-````
-
-.. raw:: html
-
-    <a name="x520-114b-4t4c"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/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/cpta-vts-114b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/vts-3n-hsw-xl710.rst
index 9b1f11d27c..c71a7bea7c 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/vts-3n-hsw-xl710.rst
@@ -1,44 +1,53 @@
-3n-hsw-x710-64b-base
---------------------
+3n-hsw-xl710
+------------
+
+114b-vts-l2switching-base-i40e
+``````````````````````````````
+
+..
+    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr
+    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr
+    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-1t1c-base"></a>
+    <a name="114b-1t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-1t1c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-2t2c-base"></a>
+    <a name="114b-2t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t2c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x710-64b-4t4c-base"></a>
+    <a name="114b-4t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t4c-x710-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
+
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vts-3n-skx-xxv710.rst
index e6995d4eb9..77a4f60f85 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/vts-3n-skx-xxv710.rst
@@ -1,44 +1,52 @@
-3n-skx-xxv710-64b-base
-----------------------
+3n-skx-xxv710
+-------------
+
+114b-vts-l2switching-base-i40e
+``````````````````````````````
+
+..
+    25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr
+    25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr
 
 2t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-64b-2t1c-base"></a>
+    <a name="114b-2t1c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-2t1c-xxv710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 4t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-64b-4t2c-base"></a>
+    <a name="114b-4t2c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-4t2c-xxv710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
 8t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="xxv710-64b-8t4c-base"></a>
+    <a name="114b-8t4c-base-i40e"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/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/cpta-container-memif-l2-8t4c-xxv710-3n-skx.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-tsh-x520-64b-base-scale.rst b/docs/cpta/trending/vts-3n-tsh-x520.rst
index 0d2743985b..3f24ea9722 100644
--- a/docs/cpta/trending/ip4-3n-tsh-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/vts-3n-tsh-x520.rst
@@ -1,44 +1,53 @@
-3n-tsh-x520-64b-base-scale
---------------------------
+3n-tsh-x520
+-----------
+
+114b-vts-l2switching-base-ixgbe
+```````````````````````````````
+
+..
+    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr
+    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr
+    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr
 
 1t1c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base-scale"></a>
+    <a name="114b-1t1c-base-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/cpta-ip4-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 2t2c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base-scale"></a>
+    <a name="114b-2t2c-base-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/cpta-ip4-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
 
 4t4c
-````
+::::
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base-scale"></a>
+    <a name="114b-4t4c-base-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/cpta-ip4-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe.html"></iframe>
     <p><br></p>
     </center>
+
diff --git a/docs/cpta/trending/vts.rst b/docs/cpta/trending/vts.rst
index 6e43482994..2da42d30f5 100644
--- a/docs/cpta/trending/vts.rst
+++ b/docs/cpta/trending/vts.rst
@@ -1,6 +1,8 @@
-VTS
-===
+Virtual Topology System
+=======================
 
 .. toctree::
 
-    vts-3n-hsw-x520-114b
+    vts-3n-skx-xxv710
+    vts-3n-hsw-xl710
+    vts-3n-tsh-x520