From 1dfc0a8ba0ff86c3d2cfa7e839997737b0b0c312 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 19 Feb 2019 13:00:54 +0100
Subject: CSIT-1436: Add titles to plots in Trending

CSIT-1435: Remove index from Trending

Change-Id: I616b055d7ad12f241df5fa43fb121d20ef7d7e23
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 223516c8592161568843cb1c19c009411f476f24)
---
 docs/cpta/index.rst                                |  6 -----
 docs/cpta/indices.rst                              |  4 ---
 .../container_memif-2n-skx-x710-64b-base.rst       | 30 +++++----------------
 .../container_memif-2n-skx-x710-imix-base.rst      | 30 +++++----------------
 .../container_memif-2n-skx-xxv710-64b-base.rst     | 30 +++++----------------
 .../container_memif-2n-skx-xxv710-imix-base.rst    | 30 +++++----------------
 .../container_memif-3n-hsw-x520-64b-base.rst       | 30 +++++----------------
 .../container_memif-3n-hsw-x520-imix-base.rst      | 30 +++++----------------
 .../container_memif-3n-hsw-x710-64b-base.rst       | 30 +++++----------------
 .../container_memif-3n-hsw-x710-imix-base.rst      | 30 +++++----------------
 .../container_memif-3n-hsw-xl710-64b-base.rst      | 30 +++++----------------
 .../container_memif-3n-hsw-xl710-imix-base.rst     | 30 +++++----------------
 .../container_memif-3n-skx-x710-64b-base.rst       | 30 +++++----------------
 .../container_memif-3n-skx-x710-imix-base.rst      | 30 +++++----------------
 .../container_memif-3n-skx-xxv710-64b-base.rst     | 30 +++++----------------
 .../container_memif-3n-skx-xxv710-imix-base.rst    | 30 +++++----------------
 docs/cpta/trending/dpdk-2n-skx-x710-64b.rst        | 30 +++++----------------
 docs/cpta/trending/dpdk-2n-skx-x710-imix.rst       | 30 +++++----------------
 docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst      | 30 +++++----------------
 docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst     | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst        | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst       | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst        | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst       | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst       | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst      | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-skx-x710-64b.rst        | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-skx-x710-imix.rst       | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst      | 30 +++++----------------
 docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst     | 30 +++++----------------
 .../trending/ip4-2n-skx-x710-64b-base-scale.rst    | 30 +++++----------------
 .../cpta/trending/ip4-2n-skx-x710-64b-features.rst | 30 +++++----------------
 .../trending/ip4-2n-skx-xxv710-64b-base-scale.rst  | 30 +++++----------------
 .../trending/ip4-2n-skx-xxv710-64b-features.rst    | 30 +++++----------------
 .../trending/ip4-3n-hsw-x520-64b-base-scale.rst    | 30 +++++----------------
 .../trending/ip4-3n-hsw-x520-64b-features-iacl.rst | 30 +++++----------------
 .../trending/ip4-3n-hsw-x520-64b-features-oacl.rst | 30 +++++----------------
 .../cpta/trending/ip4-3n-hsw-x520-64b-features.rst | 30 +++++----------------
 .../trending/ip4-3n-hsw-x710-64b-base-scale.rst    | 30 +++++----------------
 .../cpta/trending/ip4-3n-hsw-x710-64b-features.rst | 30 +++++----------------
 .../ip4-3n-hsw-xl710-64b-base-scale-features.rst   | 30 +++++----------------
 .../trending/ip4-3n-skx-x710-64b-base-scale.rst    | 30 +++++----------------
 .../cpta/trending/ip4-3n-skx-x710-64b-features.rst | 30 +++++----------------
 .../trending/ip4-3n-skx-xxv710-64b-base-scale.rst  | 30 +++++----------------
 .../trending/ip4-3n-skx-xxv710-64b-features.rst    | 30 +++++----------------
 .../trending/ip4_tunnels-2n-skx-x710-64b-base.rst  | 30 +++++----------------
 .../ip4_tunnels-2n-skx-xxv710-64b-base.rst         | 30 +++++----------------
 .../trending/ip4_tunnels-3n-hsw-x520-64b-base.rst  | 30 +++++----------------
 .../trending/ip4_tunnels-3n-hsw-x710-64b-base.rst  | 30 +++++----------------
 .../trending/ip4_tunnels-3n-skx-x710-64b-base.rst  | 30 +++++----------------
 .../ip4_tunnels-3n-skx-xxv710-64b-base.rst         | 30 +++++----------------
 .../trending/ip6-2n-skx-x710-78b-base-scale.rst    | 30 +++++----------------
 .../trending/ip6-2n-skx-xxv710-78b-base-scale.rst  | 30 +++++----------------
 .../trending/ip6-3n-hsw-x520-78b-base-scale.rst    | 30 +++++----------------
 .../trending/ip6-3n-hsw-x710-78b-base-scale.rst    | 30 +++++----------------
 .../trending/ip6-3n-hsw-xl710-78b-base-scale.rst   | 30 +++++----------------
 .../trending/ip6-3n-skx-x710-78b-base-scale.rst    | 30 +++++----------------
 .../trending/ip6-3n-skx-xxv710-78b-base-scale.rst  | 30 +++++----------------
 .../trending/ipsec-3n-hsw-xl710-64b-base-scale.rst | 30 +++++----------------
 .../trending/l2-2n-skx-x710-64b-base-scale.rst     | 30 +++++----------------
 docs/cpta/trending/l2-2n-skx-x710-64b-features.rst | 30 +++++----------------
 .../trending/l2-2n-skx-xxv710-64b-base-scale.rst   | 30 +++++----------------
 .../trending/l2-2n-skx-xxv710-64b-features.rst     | 30 +++++----------------
 .../trending/l2-3n-hsw-vic1227-64b-base-scale.rst  | 30 +++++----------------
 .../trending/l2-3n-hsw-vic1385-64b-base-scale.rst  | 30 +++++----------------
 .../trending/l2-3n-hsw-x520-64b-base-scale.rst     | 30 +++++----------------
 .../trending/l2-3n-hsw-x520-64b-features-iacl.rst  | 30 +++++----------------
 .../trending/l2-3n-hsw-x520-64b-features-macip.rst | 30 +++++----------------
 .../trending/l2-3n-hsw-x520-64b-features-oacl.rst  | 30 +++++----------------
 .../trending/l2-3n-hsw-x710-64b-base-scale.rst     | 30 +++++----------------
 docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst | 30 +++++----------------
 .../trending/l2-3n-hsw-xl710-64b-base-scale.rst    | 30 +++++----------------
 .../trending/l2-3n-skx-x710-64b-base-scale.rst     | 30 +++++----------------
 docs/cpta/trending/l2-3n-skx-x710-64b-features.rst | 30 +++++----------------
 .../trending/l2-3n-skx-xxv710-64b-base-scale.rst   | 30 +++++----------------
 .../trending/l2-3n-skx-xxv710-64b-features.rst     | 30 +++++----------------
 .../cpta/trending/link_bonding-2n-skx-x710-64b.rst | 30 +++++----------------
 .../trending/link_bonding-2n-skx-x710-imix.rst     | 30 +++++----------------
 .../cpta/trending/link_bonding-3n-hsw-x520-64b.rst | 30 +++++----------------
 .../trending/link_bonding-3n-hsw-x520-imix.rst     | 30 +++++----------------
 .../cpta/trending/link_bonding-3n-hsw-x710-64b.rst | 30 +++++----------------
 .../trending/link_bonding-3n-hsw-x710-imix.rst     | 30 +++++----------------
 .../cpta/trending/link_bonding-3n-skx-x710-64b.rst | 30 +++++----------------
 .../trending/link_bonding-3n-skx-x710-imix.rst     | 30 +++++----------------
 docs/cpta/trending/srv6-3n-hsw-x520-78b.rst        | 31 +++++-----------------
 docs/cpta/trending/srv6-3n-hsw-x520-imix.rst       | 30 +++++----------------
 docs/cpta/trending/srv6.rst                        |  2 ++
 .../trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst | 30 +++++----------------
 .../vm_vhost_ip4-2n-skx-x710-imix-base.rst         | 30 +++++----------------
 .../vm_vhost_ip4-2n-skx-xxv710-64b-base.rst        | 30 +++++----------------
 .../vm_vhost_ip4-2n-skx-xxv710-imix-base.rst       | 30 +++++----------------
 .../trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst | 30 +++++----------------
 .../vm_vhost_ip4-3n-hsw-x520-imix-base.rst         | 30 +++++----------------
 .../trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst | 30 +++++----------------
 .../vm_vhost_ip4-3n-hsw-x710-imix-base.rst         | 30 +++++----------------
 .../trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst | 30 +++++----------------
 .../vm_vhost_ip4-3n-skx-x710-imix-base.rst         | 30 +++++----------------
 .../vm_vhost_ip4-3n-skx-xxv710-64b-base.rst        | 30 +++++----------------
 .../vm_vhost_ip4-3n-skx-xxv710-imix-base.rst       | 30 +++++----------------
 .../trending/vm_vhost_l2-2n-skx-x710-64b-base.rst  | 30 +++++----------------
 .../trending/vm_vhost_l2-2n-skx-x710-imix-base.rst | 30 +++++----------------
 .../vm_vhost_l2-2n-skx-xxv710-64b-base.rst         | 30 +++++----------------
 .../vm_vhost_l2-2n-skx-xxv710-imix-base.rst        | 30 +++++----------------
 .../vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst      | 30 +++++----------------
 .../vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst      | 30 +++++----------------
 .../vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst     | 30 +++++----------------
 .../vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst     | 30 +++++----------------
 .../trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst  | 30 +++++----------------
 .../trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst | 30 +++++----------------
 .../trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst | 30 +++++----------------
 .../vm_vhost_l2-3n-hsw-xl710-imix-base.rst         | 30 +++++----------------
 .../trending/vm_vhost_l2-3n-skx-x710-64b-base.rst  | 30 +++++----------------
 .../trending/vm_vhost_l2-3n-skx-x710-imix-base.rst | 30 +++++----------------
 .../vm_vhost_l2-3n-skx-xxv710-64b-base.rst         | 30 +++++----------------
 .../vm_vhost_l2-3n-skx-xxv710-imix-base.rst        | 30 +++++----------------
 docs/cpta/trending/vm_vhost_l2.rst                 |  6 +++--
 docs/cpta/trending/vts-3n-hsw-x520-114b.rst        | 31 +++++-----------------
 117 files changed, 684 insertions(+), 2726 deletions(-)
 delete mode 100644 docs/cpta/indices.rst

(limited to 'docs')

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 3b037f6f29..4f05500647 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -43,9 +43,3 @@ analysis and anomaly detection methodology.
     :caption: Performance Data
 
     Download <data/index>
-
-.. toctree::
-    :maxdepth: 2
-    :caption: Indices and tables
-
-    Index <indices>
diff --git a/docs/cpta/indices.rst b/docs/cpta/indices.rst
deleted file mode 100644
index 6dd08416cb..0000000000
--- a/docs/cpta/indices.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Indices and tables
-==================
-
-* :ref:`genindex`
diff --git a/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst b/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
index f5d72805ce..8e74ded94c 100644
--- a/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <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-x710-imix-base.rst
index bcc97f5927..3d1bc9469e 100644
--- a/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
index 9fe6522e8e..e458ff1fe4 100644
--- a/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
index 87f1968c3e..2c3cc7ca2b 100644
--- a/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
index 24886b15e9..d6e88cf59f 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
index 3de1138fa8..8db458a0ea 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
index 917f43cb5b..41c401db3f 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
index abe9931605..8158761e4c 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <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
index 1e03be57d3..fe371d783f 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5c0c4308d6..83da76b75b 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst b/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
index 2f8cf792e8..363eab81e1 100644
--- a/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <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-x710-imix-base.rst
index 4a9aff33e2..686518c28e 100644
--- a/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
index 1231970da3..53b7def558 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
index db18434ac1..f8fb36dc6d 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst b/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
index bedc06a7b9..76f4f878fa 100644
--- a/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst b/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
index 975fb87b08..f5277dba3d 100644
--- a/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <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
index 018d15c8ca..f1986c7993 100644
--- a/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <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
index 5bce500813..ab78e78a79 100644
--- a/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
index a9942caed9..b3298a77e9 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
index 8a6eb92eb8..72b2c49ddc 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <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
index 3c8e64393f..5b98cef906 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <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
index d5831caf26..5928ee6f2c 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <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
index 78cd14e7ee..7230885fd2 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <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
index d0e51d8f07..468aafb653 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst b/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
index 7e45e0e14c..62dd79dacc 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst b/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
index b530fde959..06950b87b2 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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>
-    <p><br><br></p>
+    <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
index ea3464a939..8498b88785 100644
--- a/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <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
index 836ddef06a..a34527738d 100644
--- a/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <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><br></p>
+    <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
index 06300de7a8..25cdee6683 100644
--- a/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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-64b-features.rst
index fa43271173..30b131aadc 100644
--- a/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <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
index e0cc09d162..2421c2301d 100644
--- a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 3b8efaba96..4a91698ebf 100644
--- a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5a302eb632..6473d31ca6 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
index 51b45bf909..3d186517a5 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-iacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-iacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-iacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <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
index a2b557a574..922bb66afe 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-oacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-oacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-oacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 28c87e3e92..52f5d72954 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index df4e831e73..2da3585d16 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index a79685c9ab..7503d9ae29 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index bc07b77c6c..81dc338e87 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base-scale-features"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-64b-base-scale-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base-scale-features"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-64b-base-scale-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base-scale-features"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-64b-base-scale-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index c30e36685b..5f14d9f66e 100644
--- a/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5d2d7c785f..582f723868 100644
--- a/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 80c0f72d0d..86332a469e 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5a1b73a4ab..0665bd329e 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
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
index 09b4d577ab..26574a4646 100644
--- a/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 741a7ba57c..cd4100368d 100644
--- a/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index a1c517c61e..9ee9f104ce 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4tun-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4tun-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4tun-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5e57348e37..df2feca41b 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4tun-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4tun-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4tun-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5e1ae91865..3728a994a9 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index ce80cf92f0..05b6fe6f0c 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index fceabf0232..a338e6e758 100644
--- a/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 9e7aa5fe9d..df2ddf7304 100644
--- a/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index e065f2b091..c8c9f7d55a 100644
--- a/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-78b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip6-78b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-78b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip6-78b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-78b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip6-78b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 980daa65fd..e05ff0a143 100644
--- a/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-78b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip6-78b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-78b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip6-78b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-78b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip6-78b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 8156e6d2a2..8edf6cc24f 100644
--- a/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-78b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip6-78b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-78b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip6-78b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-78b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip6-78b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 94746d95c0..0b45bcc303 100644
--- a/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index e0936d3a48..069400ac0b 100644
--- a/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst b/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
index 3f595570f6..ebaed4fe57 100644
--- a/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
+++ b/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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-ipsec-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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-ipsec-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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-ipsec-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <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
index e16db7a804..4c292e064f 100644
--- a/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 4397b5c87f..f17c888c25 100644
--- a/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index a5072a8999..d379052f04 100644
--- a/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 673dbaa652..0195668c1b 100644
--- a/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 87234539ab..61f9a351b9 100644
--- a/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="vic1227-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1227-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="vic1227-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1227-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="vic1227-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1227-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 3fc443dab6..9bb21d8044 100644
--- a/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="vic1385-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1385-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="vic1385-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1385-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="vic1385-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1385-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index c11192afbe..c20bb322ac 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 1dd2088a4c..38102284ad 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-iacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-iacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-iacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index ec1322c812..e7499b8aad 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-macip"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-macip-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-macip"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-macip-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-macip"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-macip-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index e650a2c020..fa2b788779 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-oacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-oacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-oacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 3bd15429bd..5254be547d 100644
--- a/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index a2b3957628..f63a8232cd 100644
--- a/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index bfa3738216..3e7206d07a 100644
--- a/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index f860de8112..e25ecae1dc 100644
--- a/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index f570b64a5e..818d3ecc03 100644
--- a/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 23c1506cbc..9e08dcf004 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index cd1a711bc4..b16232fce3 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst b/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
index c97374b002..80f9852fbb 100644
--- a/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
+++ b/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 5947effdb7..7b32e07c95 100644
--- a/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
+++ b/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index c033712be3..557907600b 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 4ab33216ab..bf9d64015a 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index a8fefff28a..8357eb9750 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 94d3e297a1..53aae58d48 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 563c7ba634..86497aaabd 100644
--- a/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
+++ b/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index f660aec2e6..4e2c9eab97 100644
--- a/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
+++ b/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 2af5c45a7b..475a9206e1 100644
--- a/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
+++ b/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-78b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-78b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,19 +21,12 @@
 .. raw:: html
 
     <a name="x520-78b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-78b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
-
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -48,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-78b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-78b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 143ebddbbb..dddc6b12da 100644
--- a/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst
index 06d6f5b11b..b4f3f330e1 100644
--- a/docs/cpta/trending/srv6.rst
+++ b/docs/cpta/trending/srv6.rst
@@ -4,4 +4,6 @@ SRv6 Routing
 .. toctree::
 
     srv6-3n-hsw-x520-78b
+
+..
     srv6-3n-hsw-x520-imix
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
index 2236d407a4..01c3310f3e 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 236c4510e8..608823493f 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 939eb77832..c22c4b595d 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 6692c6dce4..4b49d231b7 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 81519e8679..a5634afb74 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 9152196a5b..48704fc446 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index eabe1a6c97..4a5e153d07 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index e821219bbc..a93a9fab62 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
index 14a268cd8d..538b1452c2 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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>
-    <p><br><br></p>
+    <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
index 1a5f1ea446..56ae647ef5 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 107fe1a2bc..1f48cddf86 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 93094fcbd1..2d3d275d1d 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
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
index c8511a5d1a..45caa1cb30 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 575a0a8b1d..95b30076bb 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 2c2eecc4f9..ca85a31bef 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 37d97aadac..f402abf51a 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 23a8f6a89b..a7a1449716 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 7347b2c7e3..395e16f278 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 02d51c4d4b..2e68561410 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 4dc46f1f71..0e42cbba13 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 6cfa55b959..764f1ff828 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 6a278758fe..d94093de45 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index db36fa396b..1137d624f6 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 3822a68573..0f8e37f188 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 1e3c8b0322..84b106cc90 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index e4d609162d..a2112cbae5 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 07efdbf8ee..d63ff7be06 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <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
index 30aec7047d..21a7ab5b43 100644
--- 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
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst
index 755f809007..9a618cbe40 100644
--- a/docs/cpta/trending/vm_vhost_l2.rst
+++ b/docs/cpta/trending/vm_vhost_l2.rst
@@ -6,14 +6,16 @@ L2 VMs vhost-user
     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-xl710-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-hsw-xl710-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-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
index 7143cf86a0..0b59e92299 100644
--- a/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
+++ b/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-114b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-vts-114b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,19 +21,12 @@
 .. raw:: html
 
     <a name="x520-114b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-vts-114b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
-
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -48,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-114b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-vts-114b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" 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><br></p>
+    <p><br></p>
     </center>
-- 
cgit 1.2.3-korg