Report: configure 2101.1.33

Signed-off-by: Tibor Frank <tifrank@cisco.com> Change-Id: Ibf28cba0533d6d626e0eeccd78cbb001fc7d44ad
author: Tibor Frank <tifrank@cisco.com> 2021-08-10 14:20:18 +0200
committer: Tibor Frank <tifrank@cisco.com> 2021-08-18 09:40:58 +0200
commit: 19306c5878a420251eef752ed95dfafe53d269de (patch)
tree: 9a164c043ff3bf7c35da5024baaa40a49022e5fd
parent: 082e8560f2428bb8697345ba4cbe0581cdd5fcdc (diff)
109 files changed, 599 insertions, 8909 deletions
diff --git a/.gitreview b/.gitreview
index e50baaff84..0fe303acbb 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.fd.io
 port=29418
 project=csit.git
-defaultbranch=rls2106
+defaultbranch=rls2101_1
diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index 1d94288f54..8a7973eb4b 100644
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -1,5 +1,5 @@
-CSIT-2106
-=========
+CSIT-2101.1
+===========
 
 .. toctree::
     :maxdepth: 2
@@ -20,11 +20,6 @@ CSIT-2106
     vpp_performance_tests/packet_throughput_graphs/index
     vpp_performance_tests/throughput_speedup_multi_core/index
     vpp_performance_tests/packet_latency/index
-    vpp_performance_tests/soak_tests/index
-    vpp_performance_tests/reconf_tests/index
-    vpp_performance_tests/nf_service_density/index
-    vpp_performance_tests/hoststack_testing/index
-    vpp_performance_tests/gso_testing/index
     vpp_performance_tests/comparisons/index
     vpp_performance_tests/throughput_trending
     vpp_performance_tests/test_environment
@@ -32,34 +27,10 @@ CSIT-2106
 
 .. toctree::
     :maxdepth: 2
-    :caption: DPDK Performance
-
-    dpdk_performance_tests/overview
-    dpdk_performance_tests/csit_release_notes
-    dpdk_performance_tests/packet_throughput_graphs/index
-    dpdk_performance_tests/packet_latency/index
-    dpdk_performance_tests/comparisons/index
-    dpdk_performance_tests/throughput_trending
-    dpdk_performance_tests/test_environment
-    dpdk_performance_tests/documentation
-
-.. toctree::
-    :maxdepth: 2
-    :caption: VPP Device
-
-    vpp_device_tests/overview
-    vpp_device_tests/csit_release_notes
-    vpp_device_tests/test_environment
-    vpp_device_tests/documentation
-
-.. toctree::
-    :maxdepth: 2
     :caption: Detailed Results
 
     detailed_test_results/vpp_performance_results/index
     detailed_test_results/vpp_mrr_results/index
-    detailed_test_results/dpdk_performance_results/index
-    detailed_test_results/vpp_device_results_ubuntu/index
 
 .. toctree::
     :maxdepth: 2
@@ -67,7 +38,6 @@ CSIT-2106
 
     test_configuration/vpp_performance_configuration/index
     test_configuration/vpp_mrr_configuration/index
-    test_configuration/vpp_device_configuration_ubuntu/index
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/report/index.pdf.template b/docs/report/index.pdf.template
index 6802e588cd..bc42c1c985 100644
--- a/docs/report/index.pdf.template
+++ b/docs/report/index.pdf.template
@@ -1,11 +1,9 @@
-CSIT-2106
-=========
+CSIT-2101.1
+===========
 
 .. toctree::
     :numbered:
 
     introduction/index
     vpp_performance_tests/index
-    dpdk_performance_tests/index
-    vpp_device_tests/index
     csit_framework_documentation/index
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index f140a3b3d7..e567a95485 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -7,37 +7,7 @@ below.
 +----------------+------------------------------------------------------------+
 | .[ww] Revision | Changes                                                    |
 +================+============================================================+
-| .31            | 1. Added data:                                             |
-|                |                                                            |
-|                |    - VPP coverage data:                                    |
-|                |                                                            |
-|                |      - 3n-skx                                              |
-|                |      - 3n-tsh                                              |
-|                |      - 2n-zn2                                              |
-|                |                                                            |
-|                |    - VPP iterative data:                                   |
-|                |                                                            |
-|                |      - 3n-tsh                                              |
-|                |      - 2n-zn2                                              |
-|                |                                                            |
-|                | 2. Added AF_XDP tests:                                     |
-|                |                                                            |
-|                |    - 2n-skx                                                |
-|                |    - 2n-clx                                                |
-|                |    - 2n-zn2                                                |
-|                |                                                            |
-|                | 3. Added iterative runs for Latency                        |
-|                |                                                            |
-|                |    - 2n-skx                                                |
-|                |    - 2n-zn2                                                |
-|                |    - 2n-tsh                                                |
-|                |    - 2n-tx2                                                |
-|                |    - 3n-skx                                                |
-|                |                                                            |
-|                | 4. Added comparison tables for Latency                     |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .28            | Initial revision                                           |
+| .33            | Initial revision                                           |
 +----------------+------------------------------------------------------------+
 
 FD.io CSIT Reports follow CSIT-[yy][mm].[ww] numbering format, with version
diff --git a/docs/report/vpp_performance_tests/comparisons/index.rst b/docs/report/vpp_performance_tests/comparisons/index.rst
index 551ec9159d..e8425e7f5d 100644
--- a/docs/report/vpp_performance_tests/comparisons/index.rst
+++ b/docs/report/vpp_performance_tests/comparisons/index.rst
@@ -14,7 +14,3 @@ Comparisons
     2n-skx_vs_2n-clx_testbeds
     3n-skx_vs_2n-skx_testbeds
     nic_comparison
-    soak_vs_ndr
-
-..
-    2n-clx_vs_2n-icx_testbeds
diff --git a/docs/report/vpp_performance_tests/index.rst b/docs/report/vpp_performance_tests/index.rst
index bd497cee77..93bbe8e40d 100644
--- a/docs/report/vpp_performance_tests/index.rst
+++ b/docs/report/vpp_performance_tests/index.rst
@@ -8,11 +8,6 @@ VPP Performance
     packet_throughput_graphs/index
     throughput_speedup_multi_core/index
     packet_latency/index
-    soak_tests/index
-    reconf_tests/index
-    nf_service_density/index
-    hoststack_testing/index
-    gso_testing/index
     comparisons/index
     throughput_trending
     test_environment
diff --git a/docs/report/vpp_performance_tests/packet_latency/container_memif.rst b/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
index 1dd96dbe6c..2b47332db1 100644
--- a/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
@@ -7,7 +7,7 @@ LXC/DRC Container Memif
 =======================
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
index 775217bc5f..2c296549fd 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
@@ -174,149 +174,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-features-avf
 --------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-icx-e810cq.rst
deleted file mode 100644
index a700cdd062..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-scale-avf
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale200k}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4-ip4scale2m}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
index 91d78b6aed..fc8b585149 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
@@ -257,149 +257,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst
index fe62ea4587..fcfceaf495 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst
@@ -174,149 +174,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-features-avf
 --------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4.rst b/docs/report/vpp_performance_tests/packet_latency/ip4.rst
index 9af5fef22d..556d41227c 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4.rst
@@ -7,7 +7,7 @@ IPv4 Routing
 ============
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -18,4 +18,3 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-zn2-xxv710
     ip4-3n-tsh-x520
     ip4-2n-tx2-xl710
-    ip4-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-icx-e810cq.rst
deleted file mode 100644
index df9ec42df9..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4tunnel-base-avf
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4vxlan-l2xcbase.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4vxlan-l2xcbase}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4vxlan-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst
index cfc6cb1c2c..ed0446ac5e 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst
@@ -70,25 +70,26 @@
             \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn}
     \end{figure}
 
-.. raw:: latex
-
-    \clearpage
+..
+    .. raw:: latex
 
-.. raw:: html
+        \clearpage
 
-    <center>
-    <iframe id="3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base.html"></iframe>
-    <p><br></p>
-    </center>
+    .. raw:: html
 
-.. raw:: latex
+        <center>
+        <iframe id="3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base.html"></iframe>
+        <p><br></p>
+        </center>
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base}
-            \label{fig:3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base}
-    \end{figure}
+    .. raw:: latex
+    
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base}
+                \label{fig:3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base}
+        \end{figure}
 
 .. raw:: latex
 
@@ -133,22 +134,23 @@
             \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2bdbasemaclrn}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base}
-            \label{fig:3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base}
+                \label{fig:3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-tsh-x520.rst
index 4ffd9e3473..0ce5c1bfeb 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-tsh-x520.rst
@@ -50,27 +50,27 @@
             \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2xcbase}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn}
+                \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn}
+        \end{figure}
 
-..
     .. raw:: latex
 
         \clearpage
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst
index c5d41ce05d..6b3c9ddf00 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst
@@ -7,10 +7,9 @@ IPv4 Tunnels
 ============
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls2101_1>`_.
 
 .. toctree::
 
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
-    ip4_tunnels-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-clx-xxv710.rst
index 6af2b621b5..05587a7bc0 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-clx-xxv710.rst
@@ -174,149 +174,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-icx-e810cq.rst
deleted file mode 100644
index ba772cab17..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,194 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-78b-2t1c-ip6routing-base-scale-avf
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale200k}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-avf-ethip6-ip6scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-dpdk
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale200k}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b-2t1c-ethip6-ip6scale2m}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst
index 42d338f6f0..e2992d88cc 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst
@@ -174,149 +174,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-zn2-xxv710.rst
index 0b40bab4cf..cc752fdbe8 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-zn2-xxv710.rst
@@ -174,149 +174,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst
index 2831a80fca..e6d525c9f6 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst
@@ -28,13 +28,6 @@
 
     </script>
 
-..
-    10ge2p1x520-78b-1t1c-dot1q-ip6base
-    10ge2p1x520-78b-1t1c-ethip6-ip6base
-    10ge2p1x520-78b-1t1c-ethip6-ip6scale20k
-    10ge2p1x520-78b-1t1c-ethip6-ip6scale200k
-    10ge2p1x520-78b-1t1c-ethip6-ip6scale2m
-
 3n-tsh-x520
 ~~~~~~~~~~~
 
@@ -119,22 +112,23 @@
             \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale200k}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m}
+                \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-ethip6-ip6scale2m}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6.rst b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
index f9dae02b9c..17207b8a60 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
@@ -7,7 +7,7 @@ IPv6 Routing
 ============
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -18,6 +18,3 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-zn2-xxv710
     ip6-3n-tsh-x520
     ip6-2n-tx2-xl710
-
-..
-    ip6-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-icx-e810cq.rst
deleted file mode 100644
index a0ab55e950..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,271 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-ipsec-ip4routing-base-scale-sw-avf
--------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="9" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-icx-100ge2p1e810cq-64b-2t1c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
index 7cd5ce17b4..b4c02cdb70 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
@@ -7,10 +7,9 @@ IPSec IPv4 Routing
 ==================
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls2101_1>`_.
 
 .. toctree::
 
     ipsec-3n-skx-xxv710
     ipsec-3n-tsh-x520
-    ipsec-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/l2-2n-clx-xxv710.rst
index 3d19ea2744..ff9e88c799 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2-2n-clx-xxv710.rst
@@ -175,129 +175,6 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-af-xdp
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_latency/l2-2n-icx-e810cq.rst
deleted file mode 100644
index d06fbd5413..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/l2-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-scale-avf
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2patch.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2xcbase.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale10kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale10kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale10kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale100kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale100kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale1mmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale1mmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b-2t1c-avf-eth-l2bdscale1mmaclrn}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst
index 58fd3c54ac..009a6d8b8d 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst
@@ -154,129 +154,6 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-af-xdp
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/l2-2n-zn2-xxv710.rst
index e5f2b48bad..64639bfac0 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2-2n-zn2-xxv710.rst
@@ -174,129 +174,6 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-af-xdp
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale10kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale100kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-af-xdp-eth-l2bdscale1mmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/l2-3n-tsh-x520.rst
index 6ffbc5fd2c..642e011064 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2-3n-tsh-x520.rst
@@ -135,25 +135,26 @@
 
     \clearpage
 
-.. raw:: html
+..
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn}
+                \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2bdscale100kmaclrn}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2.rst b/docs/report/vpp_performance_tests/packet_latency/l2.rst
index e48bff5688..e03e0db3aa 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2.rst
@@ -7,7 +7,7 @@ L2 Ethernet Switching
 =====================
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -18,4 +18,3 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-zn2-xxv710
     l2-3n-tsh-x520
     l2-2n-tx2-xl710
-    l2-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/nat44.rst b/docs/report/vpp_performance_tests/packet_latency/nat44.rst
index c08c35b24b..daf1684d19 100644
--- a/docs/report/vpp_performance_tests/packet_latency/nat44.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/nat44.rst
@@ -7,7 +7,7 @@ NAT44 IPv4 Routing
 ==================
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/srv6.rst b/docs/report/vpp_performance_tests/packet_latency/srv6.rst
index 265acd3753..8be23ad5f1 100644
--- a/docs/report/vpp_performance_tests/packet_latency/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/srv6.rst
@@ -7,7 +7,7 @@ SRv6 Routing
 ============
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-clx-xxv710.rst
index ace0250b23..7b76613d38 100644
--- a/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-clx-xxv710.rst
@@ -165,25 +165,26 @@
 64b-2t1c-vhost-base-dpdk-vpp
 ----------------------------
 
-.. raw:: html
+..
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
+                \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/vm_vhost-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/vm_vhost-3n-tsh-x520.rst
index 0df066a6d0..af6203bd6e 100644
--- a/docs/report/vpp_performance_tests/packet_latency/vm_vhost-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/vm_vhost-3n-tsh-x520.rst
@@ -90,22 +90,23 @@
             \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
+                \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst
index 3d8c5bcb0f..892790490f 100644
--- a/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst
@@ -9,7 +9,7 @@ KVM VMs vhost-user
 ==================
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
index 20fcf381b2..1b3a5d0fb6 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
index ad5019c7a3..a025f2438c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
@@ -31,8 +31,8 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]
-------------------------------------------------
+64b-2t1c-ip4routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
index caaa1a2ac3..407adfae78 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst
deleted file mode 100644
index 1283ae7a53..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-scale-avf
-----------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr}
-                \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-dpdk
------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
-                \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
index 85be418dad..32989a236f 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
@@ -31,8 +31,8 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]
-------------------------------------------------
+64b-2t1c-ip4routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
index bd6b7cb76f..6de5aae839 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-tx2-xl710.rst
index 37d3c46c91..6e5e8d95de 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-tx2-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-tx2-xl710.rst
@@ -74,50 +74,6 @@
 
     \clearpage
 
-..
-    64b-1t1c-ip4routing-base-scale-af-xdp
-    -------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-af_xdp-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-af_xdp-ndr}
-                \label{fig:2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-af_xdp-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-af_xdp-pdr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-af_xdp-pdr}
-                \label{fig:2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-af_xdp-pdr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 64b-1t1c-features-ip4routing-base-dpdk
 --------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-x710.rst
index 42b038bf30..3fffeae7d0 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-x710.rst
@@ -31,8 +31,8 @@
 2n-zn2-x710
 ~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]
-------------------------------------------------
+64b-2t1c-ip4routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst
index 0dca611bce..9f0943a90e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
index 82ebc2c27c..3becc6316c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -31,4 +31,3 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-tx2-xl710
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
-    ip4-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst
deleted file mode 100644
index c13ae227f9..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,160 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4tunnel-base-avf
----------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-ndr}
-                \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ip4tunnel-base-avf
------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-ndr}
-                \label{fig:3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-2t1c-ip4tunnel-base-avf
-----------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-ndr}
-                \label{fig:3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
index e821c1cbf1..dea4c7d7ed 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -23,4 +23,3 @@ CSIT source code for the test cases used for plots can be found in
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
     ip4_tunnels-3n-dnv-x553
-    ip4_tunnels-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
index c499aa5c64..32e247aa8e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
@@ -31,8 +31,8 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]
-------------------------------------------------
+78b-2t1c-ip6routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
index f354dfdba0..3e05661d00 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-base-scale-af_xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
deleted file mode 100644
index 2c45f9dccd..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-78b-2t1c-ip6routing-base-scale-avf
-----------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-ndr}
-                \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr}
-            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-dpdk
------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
-                \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
index bba19d79d5..e3ba92c274 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
@@ -31,8 +31,8 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]
-------------------------------------------------
+78b-2t1c-ip6routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
index 1d759eb151..a5b0d3daa9 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-tx2-xl710.rst
index f4411132d4..33a7b7587c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-tx2-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-tx2-xl710.rst
@@ -69,47 +69,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr}
             \label{fig:2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    78b-1t1c-ip6routing-base-scale-af-xdp
-    -------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-af_xdp-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-af_xdp-ndr}
-                \label{fig:2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-af_xdp-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-af_xdp-pdr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-af_xdp-pdr}
-                \label{fig:2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-af_xdp-pdr}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-x710.rst
index c8f75fba9d..3c5b8a53ae 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-x710.rst
@@ -31,8 +31,8 @@
 2n-zn2-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]
-------------------------------------------------
+78b-2t1c-ip6routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst
index 78154c143d..a85ae6f6a9 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
index a9bb926220..236841e4d9 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -31,4 +31,3 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-tx2-xl710
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
-    ip6-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst
deleted file mode 100644
index a4d947d41a..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,292 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
------------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
-----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="2101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
------------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
-----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
index 8e6ee61838..c6d512225e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -16,12 +16,10 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls2101_1>`_.
 
 .. toctree::
 
     ipsec-3n-skx-xxv710
     ipsec-3n-tsh-x520
     ipsec-3n-dnv-x553
-    ipsec-3n-icx-e810cq
-
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
index 758fffb080..b443da600a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
@@ -31,8 +31,8 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-l2switching-base-scale-[avf,af_xdp]
---------------------------------------------
+64b-2t1c-l2switching-base-scale-avf
+-----------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
index c4110a635b..57504de78a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
@@ -117,49 +117,6 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-af_xdp
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="121af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="122af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-l2switching-base-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst
index 6e932e2692..94ddd24e9c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst
@@ -69,47 +69,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe-pdr}
             \label{fig:2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe-pdr}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-1t1c-l2switching-base-scale-af-xdp
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="21af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-dnv-x553-64b-1t1c-l2switching-base-scale-af_xdp-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-dnv-x553-64b-1t1c-l2switching-base-scale-af_xdp-ndr}
-                \label{fig:2n-dnv-x553-64b-1t1c-l2switching-base-scale-af_xdp-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="22af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-dnv-x553-64b-1t1c-l2switching-base-scale-af_xdp-pdr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-dnv-x553-64b-1t1c-l2switching-base-scale-af_xdp-pdr}
-                \label{fig:2n-dnv-x553-64b-1t1c-l2switching-base-scale-af_xdp-pdr}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst
deleted file mode 100644
index 540b9df1b3..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-scale-avf
------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr}
-                \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-l2switching-base-scale-dpdk
-------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr}
-                \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
index 962f616376..3241923f77 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
@@ -31,8 +31,8 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-l2switching-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------------
+64b-2t1c-l2switching-base-scale-[avf,dpdk]
+------------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
index 08b7f941ad..ad4bda2108 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
@@ -160,49 +160,6 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-af-xdp
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="221af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="222af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-tx2-xl710.rst
index 0b443315d9..29bcca1f8f 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-tx2-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-tx2-xl710.rst
@@ -117,50 +117,6 @@
 
     \clearpage
 
-..
-    64b-1t1c-l2switching-scale-af-xdp
-    ---------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="011af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-1t1c-l2switching-scale-af_xdp-ndr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-1t1c-l2switching-scale-af_xdp-ndr}
-                \label{fig:2n-tx2-xl710-64b-1t1c-l2switching-scale-af_xdp-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="021af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-1t1c-l2switching-scale-af_xdp-pdr.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-1t1c-l2switching-scale-af_xdp-pdr}
-                \label{fig:2n-tx2-xl710-64b-1t1c-l2switching-scale-af_xdp-pdr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 64b-1t1c-features-l2switching-base-dpdk
 ---------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-zn2-xxv710.rst
index c4f09a1c48..98250837ef 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-zn2-xxv710.rst
@@ -117,49 +117,6 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-af-xdp
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="121af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="122af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-l2switching-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-l2switching-base-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
index a64489777c..8eefdc36b8 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -31,4 +31,3 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-tx2-xl710
     l2-2n-dnv-x553
     l2-3n-dnv-x553
-    l2-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44.rst
index 8254e0eae8..9b575f3c7f 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
index 48ae610f44..491b9a4303 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -13,7 +13,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
index 01984b80f3..8f95a90bbb 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
@@ -16,7 +16,7 @@ configurations of VPP worker thread(s), a.k.a. VPP data plane thread(s),
 and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
index b7d1498150..3d509fbfa3 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
@@ -15,7 +15,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
index 655021df12..e7d612f8f1 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
@@ -31,8 +31,8 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------
+64b-ip4routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
index 031b770351..50543dd3bb 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-ip4routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-base-scale-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst
deleted file mode 100644
index e64391d037..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-ip4routing-base-scale-avf
------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa}
-                \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-ip4routing-base-scale-dpdk
-------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa}
-                \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
index 4e7f87afa4..dacbf3250a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
@@ -31,8 +31,8 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------
+64b-ip4routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
index 6b562b78d0..7473cf21b1 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-ip4routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-base-scale-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-tx2-xl710.rst
index 997abdc59c..fcd42b4c3d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-tx2-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-tx2-xl710.rst
@@ -74,50 +74,6 @@
 
     \clearpage
 
-..
-    64b-ip4routing-base-scale-af-xdp
-    --------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-                \label{fig:2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-                \label{fig:2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 64b-features-ip4routing-base-dpdk
 ---------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-x710.rst
index 3080ce6966..5ac204e759 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-x710.rst
@@ -31,8 +31,8 @@
 2n-zn2-x710
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------
+64b-ip4routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst
index ff1c99577c..27c23a3926 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-ip4routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-base-scale-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
index 49049ccdd1..d837965e62 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -15,7 +15,7 @@ IPv4 Routed-Forwarding, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -33,4 +33,3 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-tx2-xl710
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
-    ip4-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst
deleted file mode 100644
index 79ddef59da..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,160 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-ip4tunnel-base-avf
-----------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-ip4tunnel-base-avf
-------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ip4tunnel-base-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ip4tunnel-base-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ip4tunnel-base-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ip4tunnel-base-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ip4tunnel-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ip4tunnel-base-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-ip4tunnel-base-avf
-----------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ip4tunnel-base-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ip4tunnel-base-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ip4tunnel-base-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ip4tunnel-base-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ip4tunnel-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ip4tunnel-base-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
index 8fd533b365..3045bee7b0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
@@ -15,7 +15,7 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -25,4 +25,3 @@ CSIT source code for the test cases used for plots can be found in
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
     ip4_tunnels-3n-dnv-x553
-    ip4_tunnels-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
index f072d97c0e..1a5aefa232 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
@@ -31,8 +31,8 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------
+78b-ip6routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
index cb6b356f0e..99d611d2f0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-ip6routing-base-scale-af_xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
deleted file mode 100644
index d2872e431d..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-78b-ip6routing-base-scale-avf
------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-ip6routing-base-scale-avf-ndr-tsa}
-                \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-base-scale-dpdk
-------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-ndr-tsa}
-                \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
index a25495fcc2..214a27218a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
@@ -31,8 +31,8 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------
+78b-ip6routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
index b71359354f..bf28eefebf 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-ip6routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-tx2-xl710.rst
index 3fe9da237f..23714701bd 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-tx2-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-tx2-xl710.rst
@@ -69,47 +69,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
             \label{fig:2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    78b-ip6routing-base-scale-af-xdp
-    --------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-                \label{fig:2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-                \label{fig:2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-x710.rst
index 2988d6afde..11ca75328d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-x710.rst
@@ -31,8 +31,8 @@
 2n-zn2-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]
--------------------------------------------
+78b-ip6routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst
index 1021caf2ac..479d757917 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-ip6routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
index 1ddf65d6c4..76cbfa9d6e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
@@ -15,7 +15,7 @@ IPv6 Routed-Forwarding, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -33,4 +33,3 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-tx2-xl710
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
-    ip6-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
deleted file mode 100644
index df28b000f4..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,292 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-ipsec-aes128gcm-ip4routing-scale-avf
-----------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-ipsec-aes128gcm-ip4routing-scale-avf
-------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-ipsec-aes128gcm-ip4routing-scale-avf
------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-ipsec-aes256gcm-ip4routing-scale-avf
-----------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="2101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-ipsec-aes256gcm-ip4routing-scale-avf
-------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-ipsec-aes256gcm-ip4routing-scale-avf
------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index 75a9322b63..86b9d97883 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -17,11 +17,10 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls2101_1>`_.
 
 .. toctree::
 
     ipsec-3n-skx-xxv710
     ipsec-3n-tsh-x520
     ipsec-3n-dnv-x553
-    ipsec-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
index 7077a8836b..608f2469dc 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
@@ -31,8 +31,8 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-l2switching-base-scale-[avf,af_xdp]
----------------------------------------
+64b-l2switching-base-scale-avf
+------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
index 64f052309f..a19b00592c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
@@ -117,49 +117,6 @@
 
     \clearpage
 
-64b-l2switching-base-scale-af_xdp
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="121af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="122af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-l2switching-base-dpdk
 -------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst
index 46b21ec1c0..446df2c4e8 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst
@@ -69,47 +69,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr-tsa}
             \label{fig:2n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr-tsa}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-l2switching-base-scale-af-xdp
-    ---------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="21af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-dnv-x553-64b-l2switching-base-scale-af_xdp-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-dnv-x553-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-                \label{fig:2n-dnv-x553-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="22af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-dnv-x553-64b-l2switching-base-scale-af_xdp-pdr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-dnv-x553-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-                \label{fig:2n-dnv-x553-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst
deleted file mode 100644
index e76e32bee8..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-l2switching-base-scale-avf
--------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa}
-                \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-l2switching-base-scale-dpdk
--------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa}
-                \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
index cb74f57036..99d1ed83d8 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
@@ -31,8 +31,8 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-l2switching-base-scale-[avf,dpdk,af_xdp]
---------------------------------------------
+64b-l2switching-base-scale-[avf,dpdk]
+-------------------------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
index 04c465adc4..f59966dc44 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
@@ -160,49 +160,6 @@
 
     \clearpage
 
-64b-l2switching-base-scale-af-xdp
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="221af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="222af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-l2switching-base-scale-dpdk
 -------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-tx2-xl710.rst
index c802c440e4..71809f481d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-tx2-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-tx2-xl710.rst
@@ -117,50 +117,6 @@
 
     \clearpage
 
-..
-    64b-l2switching-scale-af-xdp
-    ----------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="011af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-l2switching-scale-af-xdp-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-l2switching-scale-af-xdp-ndr-tsa}
-                \label{fig:2n-tx2-xl710-64b-l2switching-scale-af-xdp-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="021af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-l2switching-scale-af-xdp-pdr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-l2switching-scale-af-xdp-pdr-tsa}
-                \label{fig:2n-tx2-xl710-64b-l2switching-scale-af-xdp-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 64b-features-l2switching-base-dpdk
 ----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-zn2-xxv710.rst
index c48e5e1696..d5c0985a98 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-zn2-xxv710.rst
@@ -117,49 +117,6 @@
 
     \clearpage
 
-64b-l2switching-base-scale-af-xdp
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="121af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="122af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-l2switching-base-dpdk
 -------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 0b6a5328b0..89d67b2ab2 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -15,7 +15,7 @@ L2 Ethernet switching, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls2101_1>`_.
 
 .. toctree::
 
@@ -33,4 +33,3 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-tx2-xl710
     l2-2n-dnv-x553
     l2-3n-dnv-x553
-    l2-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44.rst
index 41aa461c9a..3f0b7e89de 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44.rst
@@ -15,7 +15,7 @@ IPv4 Routed-Forwarding, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
index 45ddcb862f..de1139eda3 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
@@ -15,7 +15,7 @@ SRv6, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
index 03b2ca9171..2a33de64b8 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
@@ -15,7 +15,7 @@ VM vhost-user, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls2106>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls2101_1>`_.
 
 .. toctree::
 
diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index 7c0776d7bd..d1994a1a27 100755
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -32,7 +32,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../
 python pal.py \
     --specification specifications/report \
     --release ${RELEASE} \
-    --week "31" \
+    --week "33" \
     --logging INFO \
     --force
 
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 1ffa40e242..b2d3ce22ef 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -4,9 +4,9 @@
 
 - type: "data-sets"
 
-  vpp-device-results-ubuntu:
-    csit-vpp-device-2106-ubuntu2004-x86_64-1n-skx:
-      - 169  # rls2106.rel VPP DEV env 7
+#   vpp-device-results-ubuntu:
+#     csit-vpp-device-2106-ubuntu2004-x86_64-1n-skx:
+#       - 169  # rls2106.rel VPP DEV env 7
 
 ################################################################################
 
@@ -53,21 +53,15 @@
 
   vpp-3n-skx-curr-iter:
     csit-vpp-perf-report-iterative-2106-3n-skx:
-      - 40  # rls2106.rel NDRPDR iter env 7
-      - 41  # rls2106.rel NDRPDR iter env 7
-      - 42  # rls2106.rel NDRPDR iter env 7
-      - 43  # rls2106.rel NDRPDR iter env 7
-      - 44  # rls2106.rel NDRPDR iter env 7
-      - 45  # rls2106.rel NDRPDR iter env 7
-      - 49  # rls2106.rel NDRPDR iter env 7
-      - 50  # rls2106.rel NDRPDR iter env 7
-      - 52  # rls2106.rel NDRPDR iter env 7
-      - 55  # rls2106.rel NDRPDR iter env 7
-      - 59  # rls2106.rel NDRPDR iter env 7
+      - 61  # rls2101.1.rel NDRPDR iter env 7
+      - 62  # rls2101.1.rel NDRPDR iter env 7
+      - 63  # rls2101.1.rel NDRPDR iter env 7
+      - 64  # rls2101.1.rel NDRPDR iter env 7
+      - 65  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-3n-skx-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-3n-skx:
-      - 59  # rls2106.rel NDRPDR iter env 7
+      - 61  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-3n-skx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-3n-skx:
@@ -83,99 +77,11 @@
 
   vpp-3n-skx-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-3n-skx:
-      - 37  # rls2106.rel MRR iter env 7
-
-  vpp-3n-skx-curr-iter-hoststack:
-    csit-vpp-perf-report-iterative-2106-3n-skx:
-      - 39  # rls2106.rel NDRPDR iter env 7
-      - 46  # rls2106.rel NDRPDR iter env 7
-      - 47  # rls2106.rel NDRPDR iter env 7
-      - 48  # rls2106.rel NDRPDR iter env 7
-      - 51  # rls2106.rel NDRPDR iter env 7
-      - 53  # rls2106.rel NDRPDR iter env 7
-      - 54  # rls2106.rel NDRPDR iter env 7
-      - 56  # rls2106.rel NDRPDR iter env 7
-      - 57  # rls2106.rel NDRPDR iter env 7
-      - 58  # rls2106.rel NDRPDR iter env 7
+      - 60  # rls2101.1.rel MRR iter env 7
 
   vpp-3n-skx-curr-cov:
-    csit-vpp-perf-report-coverage-2106-3n-skx:
-      - 1   # rls2106.rel NDRPDR COV env 7
-      - 3   # rls2106.rel NDRPDR COV env 7
-      - 4   # rls2106.rel NDRPDR COV env 7
-      - 6   # rls2106.rel NDRPDR COV env 7
-      - 7   # rls2106.rel NDRPDR COV env 7
-      - 8   # rls2106.rel NDRPDR COV env 7
-      - 9   # rls2106.rel NDRPDR COV env 7
-      - 10  # rls2106.rel NDRPDR COV env 7
-      - 11  # rls2106.rel NDRPDR COV env 7
-      - 12  # rls2106.rel NDRPDR COV env 7
-      - 13  # rls2106.rel NDRPDR COV env 7
-      - 14  # rls2106.rel NDRPDR COV env 7
-      - 15  # rls2106.rel NDRPDR COV env 7
-      - 16  # rls2106.rel NDRPDR COV env 7
-      - 17  # rls2106.rel NDRPDR COV env 7
-      - 18  # rls2106.rel NDRPDR COV env 7
-      - 19  # rls2106.rel NDRPDR COV env 7
-      - 20  # rls2106.rel NDRPDR COV env 7
-      - 21  # rls2106.rel NDRPDR COV env 7
-      - 22  # rls2106.rel NDRPDR COV env 7
-      - 23  # rls2106.rel NDRPDR COV env 7
-      - 24  # rls2106.rel NDRPDR COV env 7
-      - 25  # rls2106.rel NDRPDR COV env 7
-      - 26  # rls2106.rel NDRPDR COV env 7
-      - 27  # rls2106.rel NDRPDR COV env 7
-      - 28  # rls2106.rel NDRPDR COV env 7
-      - 29  # rls2106.rel NDRPDR COV env 7
-      - 30  # rls2106.rel NDRPDR COV env 7
-      - 31  # rls2106.rel NDRPDR COV env 7
-      - 32  # rls2106.rel NDRPDR COV env 7
-      - 33  # rls2106.rel NDRPDR COV env 7
-      - 34  # rls2106.rel NDRPDR COV env 7
-      - 35  # rls2106.rel NDRPDR COV env 7
-
-  dpdk-3n-skx-hist-iter:
-    csit-dpdk-perf-report-iterative-2009-3n-skx:
-      - 4   # NDRPDR sel env5
-      - 5   # NDRPDR sel env5
-      - 6   # NDRPDR sel env5
-      - 7   # NDRPDR sel env5
-      - 8   # NDRPDR sel env5
-      - 9   # NDRPDR sel env5
-      - 14  # NDRPDR sel env5
-      - 11  # NDRPDR sel env5
-      - 12  # NDRPDR sel env5
-      - 13  # NDRPDR sel env5
-
-  dpdk-3n-skx-prev-iter:
-    csit-dpdk-perf-report-iterative-2101-3n-skx:
-      - 12  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 15  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
-      - 22  # rls2101 NDRPDR iter env 6
-      - 25  # rls2101 NDRPDR iter env 6
-      - 26  # rls2101 NDRPDR iter env 6
-
-  dpdk-3n-skx-curr-iter:
-    csit-dpdk-perf-report-iterative-2106-3n-skx:
-      - 1   # rls2106 NDRPDR iter env 7
-      - 2   # rls2106 NDRPDR iter env 7
-      - 3   # rls2106 NDRPDR iter env 7
-      - 4   # rls2106 NDRPDR iter env 7
-      - 5   # rls2106 NDRPDR iter env 7
-      - 6   # rls2106 NDRPDR iter env 7
-      - 7   # rls2106 NDRPDR iter env 7
-      - 8   # rls2106 NDRPDR iter env 7
-      - 9   # rls2106 NDRPDR iter env 7
-      - 10  # rls2106 NDRPDR iter env 7
-
-  dpdk-3n-skx-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2106-3n-skx:
-      - 2   # rls2106 NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2106-3n-skx:
+      - 61  # rls2101.1.rel NDRPDR iter env 7
 
   # 2n-skx
 
@@ -240,31 +146,15 @@
 
   vpp-2n-skx-curr-iter:
     csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 59  # rls2106.rel NDRPDR iter env 7
-      - 60  # rls2106.rel NDRPDR iter env 7
-      - 61  # rls2106.rel NDRPDR iter env 7
-      - 65  # rls2106.rel NDRPDR iter env 7
-      - 66  # rls2106.rel NDRPDR iter env 7
-      - 67  # rls2106.rel NDRPDR iter env 7
-      - 68  # rls2106.rel NDRPDR iter env 7
-      - 69  # rls2106.rel NDRPDR iter env 7
-      - 70  # rls2106.rel NDRPDR iter env 7
-      - 71  # rls2106.rel NDRPDR iter env 7
-      - 89  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 90  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 91  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 92  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 93  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 95  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 96  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 97  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 98  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 99  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 100 # rls2106.rel NDRPDR iter env 7
+      - 102 # rls2101.1.rel NDRPDR iter env 7
+      - 103 # rls2101.1.rel NDRPDR iter env 7
+      - 104 # rls2101.1.rel NDRPDR iter env 7
+      - 105 # rls2101.1.rel NDRPDR iter env 7
+      - 106 # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-skx-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 100 # rls2106.rel NDRPDR iter env 7
+      - 102 # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-skx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-skx:
@@ -280,136 +170,11 @@
 
   vpp-2n-skx-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 52  # rls2106.rel MRR iter env 7
-      - 88  # rls2106.rel MRR AF-XDP iter env 7
-
-  vpp-2n-skx-curr-soak:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 58  # rls2106.rel soak env 7
-      - 64  # rls2106.rel soak env 7
-  vpp-soak-vs-ndr-2n-skx-ref:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 59  # rls2106.rel NDRPDR iter env 7
-      - 60  # rls2106.rel NDRPDR iter env 7
-      - 61  # rls2106.rel NDRPDR iter env 7
-      - 65  # rls2106.rel NDRPDR iter env 7
-      - 66  # rls2106.rel NDRPDR iter env 7
-      - 67  # rls2106.rel NDRPDR iter env 7
-      - 68  # rls2106.rel NDRPDR iter env 7
-      - 69  # rls2106.rel NDRPDR iter env 7
-      - 70  # rls2106.rel NDRPDR iter env 7
-      - 71  # rls2106.rel NDRPDR iter env 7
-  vpp-soak-vs-ndr-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 59  # rls2106.rel NDRPDR iter env 7
-      - 60  # rls2106.rel NDRPDR iter env 7
-      - 61  # rls2106.rel NDRPDR iter env 7
-      - 65  # rls2106.rel NDRPDR iter env 7
-      - 66  # rls2106.rel NDRPDR iter env 7
-      - 67  # rls2106.rel NDRPDR iter env 7
-      - 68  # rls2106.rel NDRPDR iter env 7
-      - 69  # rls2106.rel NDRPDR iter env 7
-      - 70  # rls2106.rel NDRPDR iter env 7
-      - 71  # rls2106.rel NDRPDR iter env 7
-      - 58  # rls2106.rel soak env 7
-      - 64  # rls2106.rel soak env 7
-
-  vpp-2n-skx-curr-nfv-ndrpdr:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 56  # rls2106.rel NDRPDR nf-density iter env 7
-      - 62  # rls2106.rel NDRPDR nf-density iter env 7
-      - 72  # rls2106.rel NDRPDR nf-density iter env 7
-      - 80  # rls2106.rel NDRPDR nf-density iter env 7
-      - 81  # rls2106.rel NDRPDR nf-density iter env 7
-      - 82  # rls2106.rel NDRPDR nf-density iter env 7
-      - 83  # rls2106.rel NDRPDR nf-density iter env 7
-      - 84  # rls2106.rel NDRPDR nf-density iter env 7
-      - 85  # rls2106.rel NDRPDR nf-density iter env 7
-      - 86  # rls2106.rel NDRPDR nf-density iter env 7
-
-  vpp-2n-skx-curr-nfv-mrr:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 53  # rls2106.rel MRR nf-density iter env 7
-
-  vpp-2n-skx-curr-nfv-reconf:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 54  # rls2106.rel NDRPDR reconf iter env 7
-      - 57  # rls2106.rel NDRPDR reconf iter env 7
-      - 63  # rls2106.rel NDRPDR reconf iter env 7
-      - 73  # rls2106.rel NDRPDR reconf iter env 7
-      - 74  # rls2106.rel NDRPDR reconf iter env 7
-      - 75  # rls2106.rel NDRPDR reconf iter env 7
-      - 76  # rls2106.rel NDRPDR reconf iter env 7
-      - 77  # rls2106.rel NDRPDR reconf iter env 7
-      - 78  # rls2106.rel NDRPDR reconf iter env 7
-      - 79  # rls2106.rel NDRPDR reconf iter env 7
-
-  vpp-2n-skx-curr-gso:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 55  # rls2106.rel MRR GSO iter env 7
+      - 101 # rls2101.1.rel MRR iter env 7
 
   vpp-2n-skx-curr-cov:
-    csit-vpp-perf-report-coverage-2106-2n-skx:
-      - 1   # rls2106.rel NDRPDR COV env 7
-      - 2   # rls2106.rel NDRPDR COV env 7
-      - 3   # rls2106.rel NDRPDR COV env 7
-      - 4   # rls2106.rel NDRPDR COV env 7
-      - 5   # rls2106.rel NDRPDR COV env 7
-      - 6   # rls2106.rel NDRPDR COV env 7
-      - 7   # rls2106.rel NDRPDR COV env 7
-      - 8   # rls2106.rel NDRPDR COV env 7
-      - 9   # rls2106.rel NDRPDR COV env 7
-      - 10  # rls2106.rel NDRPDR COV env 7
-      - 11  # rls2106.rel NDRPDR COV env 7
-      - 12  # rls2106.rel NDRPDR COV env 7
-      - 13  # rls2106.rel NDRPDR COV env 7
-      - 14  # rls2106.rel NDRPDR COV env 7
-      - 15  # rls2106.rel NDRPDR COV env 7
-      - 16  # rls2106.rel NDRPDR COV env 7
-      - 17  # rls2106.rel NDRPDR COV env 7
-
-  dpdk-2n-skx-hist-iter:
-    csit-dpdk-perf-report-iterative-2009-2n-skx:
-      - 4   # NDRPDR iter env5
-      - 5   # NDRPDR iter env5
-      - 6   # NDRPDR iter env5
-      - 7   # NDRPDR iter env5
-      - 8   # NDRPDR iter env5
-      - 9   # NDRPDR iter env5
-      - 10  # NDRPDR iter env5
-      - 11  # NDRPDR iter env5
-      - 12  # NDRPDR iter env5
-      - 13  # NDRPDR iter env5
-
-  dpdk-2n-skx-prev-iter:
-    csit-dpdk-perf-report-iterative-2101-2n-skx:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 15  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
-
-  dpdk-2n-skx-curr-iter:
-    csit-dpdk-perf-report-iterative-2106-2n-skx:
-      - 11  # rls2106 NDRPDR iter env 7
-      - 2   # rls2106 NDRPDR iter env 7
-      - 3   # rls2106 NDRPDR iter env 7
-      - 4   # rls2106 NDRPDR iter env 7
-      - 5   # rls2106 NDRPDR iter env 7
-      - 6   # rls2106 NDRPDR iter env 7
-      - 7   # rls2106 NDRPDR iter env 7
-      - 8   # rls2106 NDRPDR iter env 7
-      - 9   # rls2106 NDRPDR iter env 7
-      - 10  # rls2106 NDRPDR iter env 7
-
-  dpdk-2n-skx-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2106-2n-skx:
-      - 2   # rls2106 NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2106-2n-skx:
+      - 102 # rls2101.1.rel NDRPDR iter env 7
 
   # 2n-zn2
 
@@ -464,35 +229,14 @@
 
   vpp-2n-zn2-curr-iter:
     csit-vpp-perf-report-iterative-2106-2n-zn2:
-      - 38  # rls2106.rel NDRPDR iter env 7
-      - 39  # rls2106.rel NDRPDR iter env 7
-      - 40  # rls2106.rel NDRPDR iter env 7
-      - 41  # rls2106.rel NDRPDR iter env 7
-      - 42  # rls2106.rel NDRPDR iter env 7
-      - 43  # rls2106.rel NDRPDR iter env 7
-      - 44  # rls2106.rel NDRPDR iter env 7
-      - 45  # rls2106.rel NDRPDR iter env 7
-      - 46  # rls2106.rel NDRPDR iter env 7
-      - 47  # rls2106.rel NDRPDR iter env 7
-      - 49  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 50  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 51  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 52  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 53  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 54  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 55  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 56  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 57  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 58  # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 59  # rls2106.rel NDRPDR iter env 7
+      - 61  # rls2101.1.rel NDRPDR iter env 7
+      - 62  # rls2101.1.rel NDRPDR iter env 7
+      - 63  # rls2101.1.rel NDRPDR iter env 7
+      - 64  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-zn2-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-2n-zn2:
-      - 59  # rls2106.rel NDRPDR iter env 7
-
-  vpp-2n-zn2-curr-iter-gso:
-    csit-vpp-perf-report-iterative-2106-2n-zn2:
-      - 37  # rls2106.rel MRR GSO iter env 7
+      - 61  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-zn2-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-zn2:
@@ -508,69 +252,11 @@
 
   vpp-2n-zn2-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-2n-zn2:
-      - 36  # rls2106.rel MRR iter env 7
-      - 48  # rls2106.rel MRR AF-XDP iter env 7
+      - 60  # rls2101.1.rel MRR iter env 7
 
   vpp-2n-zn2-curr-cov:
-    csit-vpp-perf-report-coverage-2106-2n-zn2:
-      - 1   # rls2106.rel NDRPDR COV env 7
-      - 2   # rls2106.rel NDRPDR COV env 7
-      - 3   # rls2106.rel NDRPDR COV env 7
-      - 4   # rls2106.rel NDRPDR COV env 7
-      - 6   # rls2106.rel NDRPDR COV env 7
-      - 7   # rls2106.rel NDRPDR COV env 7
-      - 8   # rls2106.rel NDRPDR COV env 7
-      - 9   # rls2106.rel NDRPDR COV env 7
-      - 11  # rls2106.rel NDRPDR COV env 7
-      - 12  # rls2106.rel NDRPDR COV env 7
-      - 13  # rls2106.rel NDRPDR COV env 7
-      - 14  # rls2106.rel NDRPDR COV env 7
-      - 15  # rls2106.rel NDRPDR COV env 7
-      - 18  # rls2106.rel NDRPDR COV env 7
-      - 19  # rls2106.rel NDRPDR COV env 7
-
-  dpdk-2n-zn2-hist-iter:
-    csit-dpdk-perf-report-iterative-2101-2n-zn2:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 16  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
-
-  dpdk-2n-zn2-prev-iter:
-    csit-dpdk-perf-report-iterative-2101-2n-zn2:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 16  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
-
-  dpdk-2n-zn2-curr-iter:
-    csit-dpdk-perf-report-iterative-2106-2n-zn2:
-      - 11  # rls2106 NDRPDR iter env 7
-      - 2   # rls2106 NDRPDR iter env 7
-      - 3   # rls2106 NDRPDR iter env 7
-      - 4   # rls2106 NDRPDR iter env 7
-      - 5   # rls2106 NDRPDR iter env 7
-      - 6   # rls2106 NDRPDR iter env 7
-      - 7   # rls2106 NDRPDR iter env 7
-      - 8   # rls2106 NDRPDR iter env 7
-      - 9   # rls2106 NDRPDR iter env 7
-      - 10  # rls2106 NDRPDR iter env 7
-
-  dpdk-2n-zn2-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2106-2n-zn2:
-      - 2   # rls2106 NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2106-2n-zn2:
+      - 61  # rls2101.1.rel NDRPDR iter env 7
 
   # 2n-clx
 
@@ -655,31 +341,15 @@
 
   vpp-2n-clx-curr-iter:
     csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 75  # rls2106.rel NDRPDR iter env 7
-      - 76  # rls2106.rel NDRPDR iter env 7
-      - 77  # rls2106.rel NDRPDR iter env 7
-      - 82  # rls2106.rel NDRPDR iter env 7
-      - 83  # rls2106.rel NDRPDR iter env 7
-      - 84  # rls2106.rel NDRPDR iter env 7
-      - 85  # rls2106.rel NDRPDR iter env 7
-      - 86  # rls2106.rel NDRPDR iter env 7
-      - 87  # rls2106.rel NDRPDR iter env 7
-      - 88  # rls2106.rel NDRPDR iter env 7
-      - 124 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 125 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 126 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 127 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 128 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 129 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 130 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 131 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 132 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 133 # rls2106.rel NDRPDR AF-XDP iter env 7
-      - 134 # rls2106.rel NDRPDR iter env 7
+      - 146 # rls2101.1.rel NDRPDR iter env 7
+      - 147 # rls2101.1.rel NDRPDR iter env 7
+      - 148 # rls2101.1.rel NDRPDR iter env 7
+      - 149 # rls2101.1.rel NDRPDR iter env 7
+      - 150 # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-clx-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 134 # rls2106.rel NDRPDR iter env 7
+      - 146 # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-clx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-clx:
@@ -698,143 +368,11 @@
 
   vpp-2n-clx-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 66  # rls2106.rel MRR iter env 7
-
-  vpp-2n-clx-curr-iter-gso:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 70  # rls2106.rel MRR GSO iter env 7
-
-  vpp-2n-clx-curr-iter-vsap:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 74  # rls2106.rel VSAP iter env 7
-      - 81  # rls2106.rel VSAP iter env 7
-      - 91  # rls2106.rel VSAP iter env 7
-      - 105 # rls2106.rel VSAP iter env 7
-      - 106 # rls2106.rel VSAP iter env 7
-      - 107 # rls2106.rel VSAP iter env 7
-      - 108 # rls2106.rel VSAP iter env 7
-      - 109 # rls2106.rel VSAP iter env 7
-      - 110 # rls2106.rel VSAP iter env 7
-      - 111 # rls2106.rel VSAP iter env 7
-
-  vpp-2n-clx-curr-nfv-ndrpdr:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 71  # rls2106.rel NDRPDR nf-density iter env 7
-      - 78  # rls2106.rel NDRPDR nf-density iter env 7
-      - 89  # rls2106.rel NDRPDR nf-density iter env 7
-      - 92  # rls2106.rel NDRPDR nf-density iter env 7
-      - 99  # rls2106.rel NDRPDR nf-density iter env 7
-      - 100 # rls2106.rel NDRPDR nf-density iter env 7
-      - 101 # rls2106.rel NDRPDR nf-density iter env 7
-      - 102 # rls2106.rel NDRPDR nf-density iter env 7
-      - 103 # rls2106.rel NDRPDR nf-density iter env 7
-      - 104 # rls2106.rel NDRPDR nf-density iter env 7
-
-  vpp-2n-clx-curr-nfv-mrr:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 67  # rls2106.rel MRR nf-density iter env 7
-
-  vpp-2n-clx-curr-nfv-reconf:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 68  # rls2106.rel NDRPDR reconf iter env 7
-      - 72  # rls2106.rel NDRPDR reconf iter env 7
-      - 79  # rls2106.rel NDRPDR reconf iter env 7
-      - 90  # rls2106.rel NDRPDR reconf iter env 7
-      - 93  # rls2106.rel NDRPDR reconf iter env 7
-      - 94  # rls2106.rel NDRPDR reconf iter env 7
-      - 95  # rls2106.rel NDRPDR reconf iter env 7
-      - 96  # rls2106.rel NDRPDR reconf iter env 7
-      - 97  # rls2106.rel NDRPDR reconf iter env 7
-      - 98  # rls2106.rel NDRPDR reconf iter env 7
-
-  vpp-2n-clx-curr-soak:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 73  # rls2106.rel soak env 7
-      - 80  # rls2106.rel soak env 7
-  vpp-soak-vs-ndr-2n-clx-ref:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 75  # rls2106.rel NDRPDR iter env 7
-      - 76  # rls2106.rel NDRPDR iter env 7
-      - 77  # rls2106.rel NDRPDR iter env 7
-      - 82  # rls2106.rel NDRPDR iter env 7
-      - 83  # rls2106.rel NDRPDR iter env 7
-      - 84  # rls2106.rel NDRPDR iter env 7
-      - 85  # rls2106.rel NDRPDR iter env 7
-      - 86  # rls2106.rel NDRPDR iter env 7
-      - 87  # rls2106.rel NDRPDR iter env 7
-      - 88  # rls2106.rel NDRPDR iter env 7
-  vpp-soak-vs-ndr-2n-clx:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 75  # rls2106.rel NDRPDR iter env 7
-      - 76  # rls2106.rel NDRPDR iter env 7
-      - 77  # rls2106.rel NDRPDR iter env 7
-      - 82  # rls2106.rel NDRPDR iter env 7
-      - 83  # rls2106.rel NDRPDR iter env 7
-      - 84  # rls2106.rel NDRPDR iter env 7
-      - 85  # rls2106.rel NDRPDR iter env 7
-      - 86  # rls2106.rel NDRPDR iter env 7
-      - 87  # rls2106.rel NDRPDR iter env 7
-      - 88  # rls2106.rel NDRPDR iter env 7
-      - 73  # rls2106.rel soak env 7
-      - 80  # rls2106.rel soak env 7
+      - 145 # rls2101.1.rel MRR iter env 7
 
   vpp-2n-clx-curr-cov:
-    csit-vpp-perf-report-coverage-2106-2n-clx:
-      - 1   # rls2106.rel NDRPDR COV env 7
-      - 2   # rls2106.rel NDRPDR COV env 7
-      - 3   # rls2106.rel NDRPDR COV env 7
-      - 4   # rls2106.rel NDRPDR COV env 7
-      - 5   # rls2106.rel NDRPDR COV env 7
-      - 6   # rls2106.rel NDRPDR COV env 7
-      - 7   # rls2106.rel NDRPDR COV env 7
-      - 8   # rls2106.rel NDRPDR COV env 7
-      - 9   # rls2106.rel NDRPDR COV env 7
-      - 10  # rls2106.rel NDRPDR COV env 7
-      - 11  # rls2106.rel NDRPDR COV env 7
-      - 12  # rls2106.rel NDRPDR COV env 7
-      - 13  # rls2106.rel NDRPDR COV env 7
-      - 14  # rls2106.rel NDRPDR COV env 7
-      - 15  # rls2106.rel NDRPDR COV env 7
-      - 16  # rls2106.rel NDRPDR COV env 7
-      - 17  # rls2106.rel NDRPDR COV env 7
-
-  dpdk-2n-clx-hist-iter:
-    csit-dpdk-perf-report-iterative-2009-2n-clx:
-      - 4   # NDRPDR iter env5
-      - 5   # NDRPDR iter env5
-      - 6   # NDRPDR iter env5
-      - 7   # NDRPDR iter env5
-      - 8   # NDRPDR iter env5
-      - 9   # NDRPDR iter env5
-      - 10  # NDRPDR iter env5
-      - 11  # NDRPDR iter env5
-      - 12  # NDRPDR iter env5
-      - 13  # NDRPDR iter env5
-
-  dpdk-2n-clx-prev-iter:
-    csit-dpdk-perf-report-iterative-2101-2n-clx:
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 22  # rls2101 NDRPDR iter env 6
-
-  dpdk-2n-clx-curr-iter:
-    csit-dpdk-perf-report-iterative-2106-2n-clx:
-      - 11  # rls2106 NDRPDR iter env 7
-      - 2   # rls2106 NDRPDR iter env 7
-      - 3   # rls2106 NDRPDR iter env 7
-      - 4   # rls2106 NDRPDR iter env 7
-      - 5   # rls2106 NDRPDR iter env 7
-      - 6   # rls2106 NDRPDR iter env 7
-      - 7   # rls2106 NDRPDR iter env 7
-      - 8   # rls2106 NDRPDR iter env 7
-      - 9   # rls2106 NDRPDR iter env 7
-      - 10  # rls2106 NDRPDR iter env 7
-
-  dpdk-2n-clx-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2106-2n-clx:
-      - 2   # rls2106 NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 146 # rls2101.1.rel NDRPDR iter env 7
 
   # 3n-tsh
 
@@ -880,21 +418,14 @@
 
   vpp-3n-tsh-curr-iter:
     csit-vpp-perf-report-iterative-2106-3n-tsh:
-      - 19  # rls2106.rel NDRPDR iter env 7
-      - 20  # rls2106.rel NDRPDR iter env 7
-      - 21  # rls2106.rel NDRPDR iter env 7
-      - 22  # rls2106.rel NDRPDR iter env 7
-      - 23  # rls2106.rel NDRPDR iter env 7
-      - 24  # rls2106.rel NDRPDR iter env 7
-      - 25  # rls2106.rel NDRPDR iter env 7
-      - 26  # rls2106.rel NDRPDR iter env 7
-      - 27  # rls2106.rel NDRPDR iter env 7
-      - 28  # rls2106.rel NDRPDR iter env 7
-      - 30  # rls2106.rel NDRPDR iter env 7
+      - 32  # rls2101.1.rel NDRPDR iter env 7
+      - 33  # rls2101.1.rel NDRPDR iter env 7
+      - 34  # rls2101.1.rel NDRPDR iter env 7
+      - 35  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-3n-tsh-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-3n-tsh:
-      - 30  # rls2106.rel NDRPDR iter env 7
+      - 32  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-3n-tsh-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-3n-tsh:
@@ -912,70 +443,11 @@
 
   vpp-3n-tsh-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-3n-tsh:
-      - 18  # rls2106.rel MRR iter env 7
+      - 31  # rls2101.1.rel MRR iter env 7
 
   vpp-3n-tsh-curr-cov:
-    csit-vpp-perf-report-coverage-2106-3n-tsh:
-      - 1   # rls2106.rel NDRPDR COV env 7
-      - 2   # rls2106.rel NDRPDR COV env 7
-      - 3   # rls2106.rel NDRPDR COV env 7
-      - 4   # rls2106.rel NDRPDR COV env 7
-      - 5   # rls2106.rel NDRPDR COV env 7
-      - 6   # rls2106.rel NDRPDR COV env 7
-      - 7   # rls2106.rel NDRPDR COV env 7
-      - 8   # rls2106.rel NDRPDR COV env 7
-      - 9   # rls2106.rel NDRPDR COV env 7
-      - 10  # rls2106.rel NDRPDR COV env 7
-      - 11  # rls2106.rel NDRPDR COV env 7
-      - 12  # rls2106.rel NDRPDR COV env 7
-      - 13  # rls2106.rel NDRPDR COV env 7
-      - 14  # rls2106.rel NDRPDR COV env 7
-      - 16  # rls2106.rel NDRPDR COV env 7
-      - 17  # rls2106.rel NDRPDR COV env 7
-      - 18  # rls2106.rel NDRPDR COV env 7
-
-  dpdk-3n-tsh-hist-iter:
-    csit-dpdk-perf-report-iterative-2009-3n-tsh:
-      - 1   # NDRPDR iter env5
-      - 2   # NDRPDR iter env5
-      - 3   # NDRPDR iter env5
-      - 4   # NDRPDR iter env5
-      - 5   # NDRPDR iter env5
-      - 6   # NDRPDR iter env5
-      - 7   # NDRPDR iter env5
-      - 9   # NDRPDR iter env5
-      - 10  # NDRPDR iter env5
-      - 11  # NDRPDR iter env5
-
-  dpdk-3n-tsh-prev-iter:
-    csit-dpdk-perf-report-iterative-2101-3n-tsh:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 16  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
-
-  dpdk-3n-tsh-curr-iter:
-    csit-dpdk-perf-report-iterative-2106-3n-tsh:
-      - 1   # rls2106 NDRPDR iter env 7
-      - 2   # rls2106 NDRPDR iter env 7
-      - 3   # rls2106 NDRPDR iter env 7
-      - 4   # rls2106 NDRPDR iter env 7
-      - 5   # rls2106 NDRPDR iter env 7
-      - 6   # rls2106 NDRPDR iter env 7
-      - 7   # rls2106 NDRPDR iter env 7
-      - 8   # rls2106 NDRPDR iter env 7
-      - 9   # rls2106 NDRPDR iter env 7
-      - 10  # rls2106 NDRPDR iter env 7
-
-  dpdk-3n-tsh-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2106-3n-tsh:
-      - 3   # rls2106 NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2106-3n-tsh:
+      - 32  # rls2101.1.rel NDRPDR iter env 7
 
   # 2n-tx2
 
@@ -1022,21 +494,17 @@
 
   vpp-2n-tx2-curr-iter:
     csit-vpp-perf-report-iterative-2106-2n-tx2:
-      - 19  # rls2106.rel NDRPDR iter env 7
-      - 20  # rls2106.rel NDRPDR iter env 7
-      - 21  # rls2106.rel NDRPDR iter env 7
-      - 22  # rls2106.rel NDRPDR iter env 7
-      - 23  # rls2106.rel NDRPDR iter env 7
-      - 24  # rls2106.rel NDRPDR iter env 7
-      - 25  # rls2106.rel NDRPDR iter env 7
-      - 26  # rls2106.rel NDRPDR iter env 7
-      - 27  # rls2106.rel NDRPDR iter env 7
-      - 28  # rls2106.rel NDRPDR iter env 7
-      - 41  # rls2106.rel NDRPDR iter env 7
+      - 43  # rls2101.1.rel NDRPDR iter env 7
+      - 44  # rls2101.1.rel NDRPDR iter env 7
+      - 45  # rls2101.1.rel NDRPDR iter env 7
+      - 46  # rls2101.1.rel NDRPDR iter env 7
+      - 47  # rls2101.1.rel NDRPDR iter env 7
+      - 48  # rls2101.1.rel NDRPDR iter env 7
+      - 49  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-tx2-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-2n-tx2:
-      - 41  # rls2106.rel NDRPDR iter env 7
+      - 43  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-tx2-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-tx2:
@@ -1054,46 +522,11 @@
 
   vpp-2n-tx2-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-2n-tx2:
-      - 18  # rls2106.rel MRR iter env 7
-      - 29  # rls2101.rel MRR AF-XDP iter env 7
+      - 42  # rls2101.1.rel MRR iter env 7
 
   vpp-2n-tx2-curr-cov:
-    csit-vpp-perf-report-coverage-2106-2n-tx2:
-      - 1   # rls2106.rel NDRPDR COV env 7
-      - 2   # rls2106.rel NDRPDR COV env 7
-      - 3   # rls2106.rel NDRPDR COV env 7
-      - 4   # rls2106.rel NDRPDR COV env 7
-      - 5   # rls2106.rel NDRPDR COV env 7
-      - 6   # rls2106.rel NDRPDR COV env 7
-      - 7   # rls2106.rel NDRPDR COV env 7
-      - 8   # rls2106.rel NDRPDR COV env 7
-      - 9   # rls2106.rel NDRPDR COV env 7
-      - 10  # rls2106.rel NDRPDR COV env 7
-      - 11  # rls2106.rel NDRPDR COV env 7
-      - 12  # rls2106.rel NDRPDR COV env 7
-      - 13  # rls2106.rel NDRPDR COV env 7
-      - 14  # rls2106.rel NDRPDR COV env 7
-
-#   dpdk-2n-tx2-curr-iter:
-#     # TODO: Replace
-#     # csit-dpdk-perf-report-iterative-2106-2n-tx2:
-#     csit-dpdk-perf-report-iterative-2101-2n-tx2:
-#       - 4   # rls2101 NDRPDR iter env 6
-#       - 6   # rls2101 NDRPDR iter env 6
-#       - 7   # rls2101 NDRPDR iter env 6
-#       - 8   # rls2101 NDRPDR iter env 6
-#       - 9   # rls2101 NDRPDR iter env 6
-#       - 10  # rls2101 NDRPDR iter env 6
-#       - 11  # rls2101 NDRPDR iter env 6
-#       - 12  # rls2101 NDRPDR iter env 6
-#       - 13  # rls2101 NDRPDR iter env 6
-#       - 14  # rls2101 NDRPDR iter env 6
-#
-#   dpdk-2n-tx2-curr-iter-best:
-#     # TODO: Replace
-#     # csit-dpdk-perf-report-iterative-2106-2n-tx2:
-#     csit-dpdk-perf-report-iterative-2101-2n-tx2:
-#       - 4   # rls2101 NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-tx2:
+      - 43  # rls2101.1.rel NDRPDR iter env 7
 
   # 3n-dnv
 
@@ -1148,16 +581,14 @@
 
   vpp-3n-dnv-curr-iter:
     csit-vpp-perf-report-iterative-2106-3n-dnv:
-      - 39  # rls2106.rel NDRPDR iter env 7
-      - 40  # rls2106.rel NDRPDR iter env 7
-      - 41  # rls2106.rel NDRPDR iter env 7
-      - 42  # rls2106.rel NDRPDR iter env 7
-      - 43  # rls2106.rel NDRPDR iter env 7
-      - 44  # rls2106.rel NDRPDR iter env 7
-      - 45  # rls2106.rel NDRPDR iter env 7
-      - 46  # rls2106.rel NDRPDR iter env 7
-      - 47  # rls2106.rel NDRPDR iter env 7
-      - 48  # rls2106.rel NDRPDR iter env 7
+      - 51  # rls2101.1.rel NDRPDR iter env 7
+      - 52  # rls2101.1.rel NDRPDR iter env 7
+      - 53  # rls2101.1.rel NDRPDR iter env 7
+      - 54  # rls2101.1.rel NDRPDR iter env 7
+      - 55  # rls2101.1.rel NDRPDR iter env 7
+      - 57  # rls2101.1.rel NDRPDR iter env 7
+      - 58  # rls2101.1.rel NDRPDR iter env 7
+      - 59  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-3n-dnv-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2009-3n-dnv:
@@ -1173,46 +604,11 @@
 
   vpp-3n-dnv-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-3n-dnv:
-      - 38  # rls2106.rel MRR iter env 7
+      - 50  # rls2101.1.rel MRR iter env 7
 
   vpp-3n-dnv-curr-cov:
-    csit-vpp-perf-report-coverage-2106-3n-dnv:
-      - 11  # rls2106.rel NDRPDR cov env 7
-      - 12  # rls2106.rel NDRPDR cov env 7
-      - 13  # rls2106.rel NDRPDR cov env 7
-      - 14  # rls2106.rel NDRPDR cov env 7
-      - 15  # rls2106.rel NDRPDR cov env 7
-      - 16  # rls2106.rel NDRPDR cov env 7
-      - 17  # rls2106.rel NDRPDR cov env 7
-      - 19  # rls2106.rel NDRPDR cov env 7
-      - 20  # rls2106.rel NDRPDR cov env 7
-      - 21  # rls2106.rel NDRPDR cov env 7
-
-#  dpdk-performance-changes-3n-dnv-h1:
-#    csit-dpdk-perf-verify-2101-3n-dnv:
-#      - 12  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 17  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 20  # NDRPDR sel
-#      - 22  # NDRPDR sel
-#  dpdk-performance-changes-3n-dnv-ref:
-#    # No data
-#  dpdk-performance-changes-3n-dnv-cmp:
-#    # No data
-#    csit-dpdk-perf-report-iterative-2009-3n-dnv:
-
-#  plot-dpdk-throughput-latency-3n-dnv:
-#    # No data
-#    csit-dpdk-perf-report-iterative-2009-3n-dnv:
-
-#  dpdk-perf-results-3n-dnv:
-#    # No data
-#    csit-dpdk-perf-report-iterative-2009-3n-dnv:
+    csit-vpp-perf-report-iterative-2106-3n-dnv:
+      - 51  # rls2101.1.rel NDRPDR iter env 7
 
   # 2n-dnv
 
@@ -1267,16 +663,16 @@
 
   vpp-2n-dnv-curr-iter:
     csit-vpp-perf-report-iterative-2106-2n-dnv:
-      - 36  # rls2106.rel NDRPDR iter env 7
-      - 37  # rls2106.rel NDRPDR iter env 7
-      - 38  # rls2106.rel NDRPDR iter env 7
-      - 39  # rls2106.rel NDRPDR iter env 7
-      - 40  # rls2106.rel NDRPDR iter env 7
-      - 41  # rls2106.rel NDRPDR iter env 7
-      - 42  # rls2106.rel NDRPDR iter env 7
-      - 43  # rls2106.rel NDRPDR iter env 7
-      - 44  # rls2106.rel NDRPDR iter env 7
-      - 45  # rls2106.rel NDRPDR iter env 7
+      - 71  # rls2101.1.rel NDRPDR iter env 7
+      - 73  # rls2101.1.rel NDRPDR iter env 7
+      - 74  # rls2101.1.rel NDRPDR iter env 7
+      - 75  # rls2101.1.rel NDRPDR iter env 7
+      - 76  # rls2101.1.rel NDRPDR iter env 7
+      - 77  # rls2101.1.rel NDRPDR iter env 7
+      - 78  # rls2101.1.rel NDRPDR iter env 7
+      - 79  # rls2101.1.rel NDRPDR iter env 7
+      - 80  # rls2101.1.rel NDRPDR iter env 7
+      - 81  # rls2101.1.rel NDRPDR iter env 7
 
   vpp-2n-dnv-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2009-2n-dnv:
@@ -1292,68 +688,8 @@
 
   vpp-2n-dnv-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2106-2n-dnv:
-      - 35  # rls2106.rel MRR iter env 7
+      - 72  # rls2101.1.rel MRR iter env 7
 
   vpp-2n-dnv-curr-cov:
-    csit-vpp-perf-report-coverage-2106-2n-dnv:
-      - 7   # rls2106.rel NDRPDR cov env 7
-      - 8   # rls2106.rel NDRPDR cov env 7
-      - 9   # rls2106.rel NDRPDR cov env 7
-      - 10  # rls2106.rel NDRPDR cov env 7
-      - 11  # rls2106.rel NDRPDR cov env 7
-      - 13  # rls2106.rel NDRPDR cov env 7
-
-#  dpdk-performance-changes-2n-dnv-h1:
-#    csit-dpdk-perf-verify-2101-2n-dnv:
-#      - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 17  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#  dpdk-performance-changes-2n-dnv-ref:
-#    # No data
-#  dpdk-performance-changes-2n-dnv-cmp:
-#    # No data
-#    csit-dpdk-perf-report-iterative-2009-2n-dnv:
-
-#  dpdk-perf-results-2n-dnv:
-#    # No data
-#    csit-dpdk-perf-report-iterative-2009-2n-dnv:
-
-  # 2n-icx
-
-  vpp-2n-icx-curr-iter:
-    intel-csit-vpp-perf-report-iterative-2101-2n-icx:
-      - 2   # master NDRPDR iter env 6
-      - 3   # master NDRPDR iter env 6
-      - 4   # master NDRPDR iter env 6
-
-  vpp-2n-icx-curr-iter-best:
-    intel-csit-vpp-perf-report-iterative-2101-2n-icx:
-      - 2   # master NDRPDR iter env 6
-
-#   vpp-2n-icx-curr-iter-mrr:
-#     intel-csit-vpp-perf-report-iterative-2101-2n-icx:
-#       - 1   # master NDRPDR iter env 6
-#
-#   vpp-compare-testbeds-mrr-clx-icx-ref:
-#     csit-vpp-perf-report-iterative-2101-2n-clx:
-#       - 53  # rls2101.rel MRR iter env 6
-#   vpp-compare-testbeds-mrr-clx-icx-cmp:
-#     intel-csit-vpp-perf-report-iterative-2101-2n-icx:
-#       - 1   # master NDRPDR iter env 6
-
-  # 3n-icx
-
-  vpp-3n-icx-curr-iter:
-    intel-csit-vpp-perf-report-iterative-2101-3n-icx:
-      - 2   # master NDRPDR iter env 6
-
-  vpp-3n-icx-curr-iter-best:
-    intel-csit-vpp-perf-report-iterative-2101-3n-icx:
-      - 2   # master NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-dnv:
+      - 71  # rls2101.1.rel NDRPDR iter env 7
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 4a9dbbdc48..41a6d5f418 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -14,14 +14,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-3n-skx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-lat-rca2.yaml"
@@ -31,7 +31,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 3n-skx 2t1c
 - type: "table"
@@ -45,14 +45,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-3n-skx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-lat-rca2.yaml"
@@ -62,7 +62,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 3n-skx 2t1c
 - type: "table"
@@ -76,14 +76,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-3n-skx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-lat-rca2.yaml"
@@ -93,7 +93,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-skx 2t1c
 - type: "table"
@@ -107,14 +107,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-skx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-lat-rca2.yaml"
@@ -124,7 +124,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-skx 2t1c
 - type: "table"
@@ -138,14 +138,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-skx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-lat-rca2.yaml"
@@ -155,7 +155,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-skx 2t1c
 - type: "table"
@@ -169,14 +169,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-skx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-lat-rca2.yaml"
@@ -186,7 +186,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -200,14 +200,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca2.yaml"
@@ -217,7 +217,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -231,14 +231,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca2.yaml"
@@ -248,7 +248,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -262,14 +262,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca2.yaml"
@@ -279,7 +279,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -293,14 +293,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca2.yaml"
@@ -310,7 +310,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -324,14 +324,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca2.yaml"
@@ -341,7 +341,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -355,14 +355,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-lat-rca2.yaml"
@@ -372,7 +372,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -386,14 +386,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-zn2-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-2t1c-lat-rca2.yaml"
@@ -403,7 +403,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -417,14 +417,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-zn2-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-2t1c-lat-rca2.yaml"
@@ -434,7 +434,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -448,14 +448,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-zn2-2t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-2t1c-lat-rca2.yaml"
@@ -465,7 +465,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -479,14 +479,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-tx2-1t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-tx2-1t1c-lat-rca2.yaml"
@@ -496,7 +496,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -510,14 +510,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-tx2-1t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-tx2-1t1c-lat-rca2.yaml"
@@ -527,7 +527,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -541,14 +541,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-2n-tx2-1t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-tx2-1t1c-lat-rca2.yaml"
@@ -558,7 +558,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -572,14 +572,14 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-3n-tsh-1t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-lat-rca2.yaml"
@@ -589,7 +589,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -603,14 +603,14 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-3n-tsh-1t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-lat-rca2.yaml"
@@ -620,7 +620,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -634,14 +634,14 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter-best"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 1
       compare: 2
 #      rca-file: "rca/rca-3n-tsh-1t1c-lat-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-lat-rca2.yaml"
@@ -651,45 +651,7 @@
     - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Soak vs NDR - 2n-skx
-- type: "table"
-  title: "VPP Soak vs NDR 2n-skx"
-  algorithm: "table_soak_vs_ndr"
-  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
-  reference:
-    title: "NDR"
-    data: "vpp-soak-vs-ndr-2n-skx-ref"
-  compare:
-    title: "Soak"
-    data: "vpp-2n-skx-curr-soak"
-  data: "vpp-soak-vs-ndr-2n-skx"
-  include-tests: "NDR"
-  filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
-  parameters:
-    - "throughput"
-    - "name"
-    - "parent"
-
-# VPP Soak vs NDR - 2n-clx
-- type: "table"
-  title: "VPP Soak vs NDR 2n-clx"
-  algorithm: "table_soak_vs_ndr"
-  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-clx"
-  reference:
-    title: "NDR"
-    data: "vpp-soak-vs-ndr-2n-clx-ref"
-  compare:
-    title: "Soak"
-    data: "vpp-2n-clx-curr-soak"
-  data: "vpp-soak-vs-ndr-2n-clx"
-  include-tests: "NDR"
-  filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
-  parameters:
-    - "throughput"
-    - "name"
-    - "parent"
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 ################################################################################
 
@@ -1032,14 +994,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
@@ -1049,7 +1011,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -1065,14 +1027,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
@@ -1082,7 +1044,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -1098,14 +1060,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
@@ -1115,7 +1077,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -1131,14 +1093,14 @@
       data-set: "vpp-3n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
@@ -1148,7 +1110,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -1164,14 +1126,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
@@ -1181,7 +1143,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -1197,14 +1159,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
@@ -1214,7 +1176,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -1230,14 +1192,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
@@ -1247,7 +1209,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -1263,14 +1225,14 @@
       data-set: "vpp-2n-skx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
@@ -1280,7 +1242,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
@@ -1296,14 +1258,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
@@ -1313,7 +1275,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
@@ -1329,14 +1291,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
@@ -1346,7 +1308,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
@@ -1362,14 +1324,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
@@ -1379,7 +1341,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
@@ -1395,14 +1357,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
@@ -1412,7 +1374,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c pdr
 - type: "table"
@@ -1428,14 +1390,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
@@ -1445,7 +1407,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c pdr
 - type: "table"
@@ -1461,14 +1423,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
@@ -1478,7 +1440,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c ndr
 - type: "table"
@@ -1494,14 +1456,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
@@ -1511,7 +1473,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c ndr
 - type: "table"
@@ -1527,14 +1489,14 @@
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
@@ -1544,7 +1506,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c pdr
 - type: "table"
@@ -1560,14 +1522,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
@@ -1577,7 +1539,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c pdr
 - type: "table"
@@ -1593,14 +1555,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
@@ -1610,7 +1572,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c ndr
 - type: "table"
@@ -1626,14 +1588,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
@@ -1643,7 +1605,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c ndr
 - type: "table"
@@ -1659,14 +1621,14 @@
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
@@ -1676,7 +1638,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
@@ -1692,7 +1654,7 @@
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1707,7 +1669,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -1723,7 +1685,7 @@
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1738,7 +1700,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -1754,7 +1716,7 @@
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1769,7 +1731,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -1785,7 +1747,7 @@
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1800,7 +1762,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -1816,7 +1778,7 @@
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1831,7 +1793,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -1847,7 +1809,7 @@
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1862,7 +1824,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -1878,7 +1840,7 @@
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1893,7 +1855,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -1909,7 +1871,7 @@
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
@@ -1924,7 +1886,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -1940,15 +1902,15 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
@@ -1958,8 +1920,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -1975,15 +1937,15 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
 #      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
 #      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
@@ -1993,8 +1955,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -2010,15 +1972,15 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
 #      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
@@ -2028,8 +1990,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -2045,15 +2007,15 @@
       data-set: "vpp-3n-tsh-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
 #      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
 #      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
@@ -2063,8 +2025,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-tx2 1t1c pdr
 - type: "table"
@@ -2080,14 +2042,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
   legend:
@@ -2096,8 +2058,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-tx2 2t2c pdr
 - type: "table"
@@ -2113,14 +2075,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
   legend:
@@ -2129,8 +2091,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-tx2 1t1c ndr
 - type: "table"
@@ -2146,14 +2108,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
   legend:
@@ -2162,8 +2124,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-tx2 2t2c ndr
 - type: "table"
@@ -2179,14 +2141,14 @@
       data-set: "vpp-2n-tx2-prev-iter-old-env"
 #     - title: "2101.0-7"
 #       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
 #     - title: "2101.0-7 vs 2101.0-6"
 #       reference: 2
 #       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
+#     - title: "2101.1-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-6"
       reference: 2  # 3
       compare: 3  # 4
   legend:
@@ -2195,8 +2157,8 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+#     - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-6: Compares VPP code current vs previous.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr
 - type: "table"
@@ -2282,190 +2244,6 @@
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
-
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
-
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
@@ -2564,14 +2342,14 @@
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca2.yaml"
@@ -2581,7 +2359,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
@@ -2597,14 +2375,14 @@
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca2.yaml"
@@ -2614,7 +2392,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
@@ -2630,14 +2408,14 @@
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca2.yaml"
@@ -2647,7 +2425,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
@@ -2663,14 +2441,14 @@
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
@@ -2680,7 +2458,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
@@ -2696,14 +2474,14 @@
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
@@ -2713,7 +2491,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
@@ -2729,14 +2507,14 @@
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
@@ -2746,7 +2524,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -2762,14 +2540,14 @@
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
@@ -2779,7 +2557,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -2795,14 +2573,14 @@
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
@@ -2812,7 +2590,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -2828,14 +2606,14 @@
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
@@ -2845,7 +2623,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c mrr
 - type: "table"
@@ -2861,14 +2639,14 @@
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
@@ -2878,7 +2656,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c mrr
 - type: "table"
@@ -2894,14 +2672,14 @@
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
@@ -2911,7 +2689,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 8t4c mrr
 - type: "table"
@@ -2927,14 +2705,14 @@
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
@@ -2944,7 +2722,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c mrr
 - type: "table"
@@ -2960,14 +2738,14 @@
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca2.yaml"
@@ -2977,7 +2755,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c mrr
 - type: "table"
@@ -2993,14 +2771,14 @@
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca2.yaml"
@@ -3010,7 +2788,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 8t4c mrr
 - type: "table"
@@ -3026,14 +2804,14 @@
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca2.yaml"
@@ -3043,7 +2821,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
@@ -3059,14 +2837,14 @@
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-dnv-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-dnv-1t1c-mrr-rca2.yaml"
@@ -3076,7 +2854,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -3092,14 +2870,14 @@
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-dnv-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-dnv-2t2c-mrr-rca2.yaml"
@@ -3109,7 +2887,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -3125,14 +2903,14 @@
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-dnv-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-dnv-4t4c-mrr-rca2.yaml"
@@ -3142,7 +2920,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -3158,14 +2936,14 @@
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-dnv-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-dnv-1t1c-mrr-rca2.yaml"
@@ -3175,7 +2953,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -3191,14 +2969,14 @@
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-dnv-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-dnv-2t2c-mrr-rca2.yaml"
@@ -3208,7 +2986,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -3224,14 +3002,14 @@
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-dnv-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-dnv-4t4c-mrr-rca2.yaml"
@@ -3241,7 +3019,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -3257,14 +3035,14 @@
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.yaml"
@@ -3274,7 +3052,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -3290,14 +3068,14 @@
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.yaml"
@@ -3307,7 +3085,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -3323,14 +3101,14 @@
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.yaml"
@@ -3340,7 +3118,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c mrr
 - type: "table"
@@ -3356,14 +3134,14 @@
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-tx2-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-tx2-1t1c-mrr-rca2.yaml"
@@ -3373,7 +3151,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c mrr
 - type: "table"
@@ -3389,14 +3167,14 @@
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-tx2-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-tx2-2t2c-mrr-rca2.yaml"
@@ -3406,7 +3184,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 4t4c mrr
 - type: "table"
@@ -3422,14 +3200,14 @@
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2101.1-7"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
     - title: "2101.0-7 vs 2101.0-6"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-tx2-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2101.1-7 vs 2101.0-7"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-tx2-4t4c-mrr-rca2.yaml"
@@ -3439,7 +3217,7 @@
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2101.1-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
 - type: "table"
@@ -3567,75 +3345,6 @@
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
-# # VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr
-# - type: "table"
-#   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr"
-#   algorithm: "table_comparison"
-#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-mrr"
-#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '1C'"
-#   columns:
-#     - title: "2n-clx xxv710"
-#       data-set: "vpp-2n-clx-curr-iter-mrr"
-#       tag: "NIC_Intel-XXV710"
-#     - title: "2n-icx e810cq"
-#       data-set: "vpp-2n-icx-curr-iter-mrr"
-#       tag: "NIC_Intel-E810CQ"
-#   comparisons:
-#     - title: "Diff"
-#       reference: 1
-#       compare: 2
-#   legend:
-#     - ""
-#     - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-#     - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-#
-# # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr
-# - type: "table"
-#   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr"
-#   algorithm: "table_comparison"
-#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-mrr"
-#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '2C'"
-#   columns:
-#     - title: "2n-clx xxv710"
-#       data-set: "vpp-2n-clx-curr-iter-mrr"
-#       tag: "NIC_Intel-XXV710"
-#     - title: "2n-icx e810cq"
-#       data-set: "vpp-2n-icx-curr-iter-mrr"
-#       tag: "NIC_Intel-E810CQ"
-#   comparisons:
-#     - title: "Diff"
-#       reference: 1
-#       compare: 2
-#   legend:
-#     - ""
-#     - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-#     - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-#
-# # VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr
-# - type: "table"
-#   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr"
-#   algorithm: "table_comparison"
-#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-4c-mrr"
-#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '4C'"
-#   columns:
-#     - title: "2n-clx xxv710"
-#       data-set: "vpp-2n-clx-curr-iter-mrr"
-#       tag: "NIC_Intel-XXV710"
-#     - title: "2n-icx e810cq"
-#       data-set: "vpp-2n-icx-curr-iter-mrr"
-#       tag: "NIC_Intel-E810CQ"
-#   comparisons:
-#     - title: "Diff"
-#       reference: 1
-#       compare: 2
-#   legend:
-#     - ""
-#     - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-#     - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
-
 # Detailed Test Results - VPP Performance Results 3n-skx
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-skx"
@@ -3707,42 +3416,6 @@
   - "parent"
   - "msg"
 
-# Detailed Test Results - VPP Performance Results 2n-icx
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-icx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,2N,ICX]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "vpp-2n-icx-curr-iter-best"
-  filter: "'NDRPDR'"
-  remove-ndr: True
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - VPP Performance Results 3n-icx
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-icx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,3N,ICX]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "vpp-3n-icx-curr-iter-best"
-  filter: "'NDRPDR'"
-  remove-ndr: True
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - VPP Performance Results 3n-tsh
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-tsh"
@@ -3879,42 +3552,6 @@
   - "name"
   - "conf-history"
 
-# Test configuration - VPP Performance Test Configs 2n-icx
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-icx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,2N,ICX]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-      data: "data conf-history"
-  data: "vpp-2n-icx-curr-iter-best"
-  filter: "'NDRPDR'"
-  remove-ndr: True
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-# Test configuration - VPP Performance Test Configs 3n-icx
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-icx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,ICX]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-      data: "data conf-history"
-  data: "vpp-3n-icx-curr-iter-best"
-  filter: "'NDRPDR'"
-  remove-ndr: True
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
 # Test configuration - VPP Performance Test Configs 3n-tsh
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-tsh"
@@ -4015,22 +3652,6 @@
   data: "vpp-2n-clx-curr-cov"
   filter: "all"
 
-# # Test Operational Data - VPP Performance Operational Data 2n-icx
-# - type: "table"
-#   title: "Test Operational Data - VPP Performance Operational Data 2n-icx"
-#   algorithm: "table_oper_data_html"
-#   output-file: "{DIR[DTO,PERF,VPP,2N,ICX]}/"
-#   data: "vpp-2n-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
-
-# # Test Operational Data - VPP Performance Operational Data 3n-icx
-# - type: "table"
-#   title: "Test Operational Data - VPP Performance Operational Data 3n-icx"
-#   algorithm: "table_oper_data_html"
-#   output-file: "{DIR[DTO,PERF,VPP,3N,ICX]}/"
-#   data: "vpp-3n-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
-
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-tsh"
@@ -4131,40 +3752,6 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - VPP MRR Results 2n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP MRR Results 2n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,MRR,VPP,2N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-#       data: "data msg"
-#   data: "vpp-2n-icx-curr-iter-mrr"
-#   filter: "'MRR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
-
-# # Detailed Test Results - VPP MRR Results 3n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP MRR Results 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-#       data: "data msg"
-#   data: "vpp-mrr-results-3n-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
-
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-tsh"
@@ -4301,40 +3888,6 @@
   - "name"
   - "conf-history"
 
-# # Test configuration - VPP MRR Test Configs 2n-icx
-# - type: "table"
-#   title: "Test configuration - VPP MRR Test Configs 2n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,MRR,VPP,2N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-#       data: "data conf-history"
-#   data: "vpp-2n-icx-curr-iter-mrr"
-#   filter: "'MRR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
-
-# # Test configuration - VPP MRR Test Configs 3n-icx
-# - type: "table"
-#   title: "Test configuration - VPP MRR Test Configs 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-#       data: "data conf-history"
-#   data: "vpp-mrr-results-3n-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
-
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-tsh"
@@ -4403,909 +3956,42 @@
   - "name"
   - "conf-history"
 
-# Detailed Test Results - VPP Device Results - Ubuntu
-- type: "table"
-  title: "Detailed Test Results - VPP Device Results - Ubuntu"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Status |preout| "
-      data: "data status"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "doc"
-  - "status"
-
-# Test configuration - VPP Device Test Configs - Ubuntu
-- type: "table"
-  title: "Test configuration - VPP Device Test Configs - Ubuntu"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-      data: "data conf-history"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-################################################################################
-
-# DPDK Performance Changes 3n-skx 2t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 3n-skx 4t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 3n-skx 2t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 3n-skx 4t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-skx 2t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-skx 4t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-skx 2t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-skx 4t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-clx 2t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-clx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-clx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-clx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-clx 4t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-clx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-clx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-clx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-clx 2t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-clx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-clx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-clx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-clx 4t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-clx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-clx-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-clx-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-zn2 2t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-zn2 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-zn2 4t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-zn2 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-zn2 2t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-zn2 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 2n-zn2 4t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-zn2 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-## DPDK Performance Changes 2n-dnv 1t1c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 1t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 2n-dnv 2t2c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 2t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 2n-dnv 1t1c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 1t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 2n-dnv 2t2c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 2t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 1t1c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 1t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 2t2c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 2t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 1t1c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 1t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 2t2c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 2t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-
-# DPDK Performance Changes 3n-tsh 1t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-tsh 1t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 3n-tsh 2t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-tsh 2t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 3n-tsh 1t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-tsh 1t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Performance Changes 3n-tsh 2t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-tsh 2t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "20.08"
-      data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "20.11"
-      data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "20.08, 20.11, 21.02 - DPDK versions tested."
-    - "Diff - difference between 20.11 and 21.02 DPDK version."
-
-# DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
-- type: "table"
-  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
-
-# DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr
-- type: "table"
-  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
-
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
-- type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx"
-      data-set: "dpdk-3n-skx-curr-iter"
-    - title: "2n-skx"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
-
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
-- type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx"
-      data-set: "dpdk-3n-skx-curr-iter"
-    - title: "2n-skx"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
-
-# Detailed Test Results - DPDK Performance Results 3n-skx
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-3n-skx-curr-iter-best"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 2n-skx
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-2n-skx-curr-iter-best"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 2n-zn2
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-zn2"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_zn2"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-2n-zn2-curr-iter-best"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 2n-clx
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-clx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-2n-clx-curr-iter-best"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-## Detailed Test Results - DPDK Performance Results 2n-dnv
-#- type: "table"
-#  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
-#  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
-#  columns:
-#    - title: " |prein| Test Name |preout| "
-#      data: "data name"
-#    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-#      data: "data msg"
-#  data: "dpdk-perf-results-2n-dnv"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-#
-## Detailed Test Results - DPDK Performance Results 3n-dnv
-#- type: "table"
-#  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
-#  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
-#  columns:
-#    - title: " |prein| Test Name |preout| "
-#      data: "data name"
-#    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-#      data: "data msg"
-#  data: "dpdk-perf-results-3n-dnv"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 3n-tsh
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-tsh"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-3n-tsh-curr-iter-best"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# # Detailed Test Results - DPDK Performance Results 2n-tx2
+# # Detailed Test Results - VPP Device Results - Ubuntu
 # - type: "table"
-#   title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
+#   title: "Detailed Test Results - VPP Device Results - Ubuntu"
 #   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
+#   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
 #   columns:
 #     - title: " |prein| Test Name |preout| "
 #       data: "data name"
-#     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-#       data: "data msg"
-#   data: "dpdk-2n-tx2-curr-iter-best"
+#     - title: " |prein| Status |preout| "
+#       data: "data status"
+#   data: "vpp-device-results-ubuntu"
 #   filter: "all"
 #   parameters:
 #   - "name"
 #   - "parent"
-#   - "msg"
+#   - "doc"
+#   - "status"
+#
+# # Test configuration - VPP Device Test Configs - Ubuntu
+# - type: "table"
+#   title: "Test configuration - VPP Device Test Configs - Ubuntu"
+#   algorithm: "table_merged_details"
+#   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+#   columns:
+#     - title: " |prein| Test Name |preout| "
+#       data: "data name"
+#     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+#       data: "data conf-history"
+#   data: "vpp-device-results-ubuntu"
+#   filter: "all"
+#   parameters:
+#   - "parent"
+#   - "name"
+#   - "conf-history"
+
+################################################################################
 
 ################################################################################
 ###                                F I L E S                                 ###
@@ -5320,8 +4006,6 @@
     - "{DIR[DTR,PERF,VPP,2N,SKX]}"
     - "{DIR[DTR,PERF,VPP,3N,SKX]}"
     - "{DIR[DTR,PERF,VPP,2N,CLX]}"
-    - "{DIR[DTR,PERF,VPP,2N,ICX]}"
-    - "{DIR[DTR,PERF,VPP,3N,ICX]}"
     - "{DIR[DTR,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTR,PERF,VPP,3N,TSH]}"
     - "{DIR[DTR,PERF,VPP,2N,TX2]}"
@@ -5331,8 +4015,6 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -5359,8 +4041,6 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-      - "2n-icx"
-      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -5386,8 +4066,6 @@
     - "{DIR[DTC,PERF,VPP,2N,SKX]}"
     - "{DIR[DTC,PERF,VPP,3N,SKX]}"
     - "{DIR[DTC,PERF,VPP,2N,CLX]}"
-    - "{DIR[DTC,PERF,VPP,2N,ICX]}"
-    - "{DIR[DTC,PERF,VPP,3N,ICX]}"
     - "{DIR[DTC,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTC,PERF,VPP,3N,TSH]}"
     - "{DIR[DTC,PERF,VPP,2N,TX2]}"
@@ -5397,8 +4075,6 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -5425,8 +4101,6 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-      - "2n-icx"
-      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -5452,8 +4126,6 @@
     - "{DIR[DTO,PERF,VPP,2N,SKX]}"
     - "{DIR[DTO,PERF,VPP,3N,SKX]}"
     - "{DIR[DTO,PERF,VPP,2N,CLX]}"
-#     - "{DIR[DTO,PERF,VPP,2N,ICX]}"
-#     - "{DIR[DTO,PERF,VPP,3N,ICX]}"
     - "{DIR[DTO,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTO,PERF,VPP,3N,TSH]}"
     - "{DIR[DTO,PERF,VPP,2N,TX2]}"
@@ -5463,8 +4135,6 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-#     - "vpp-2n-icx-curr-iter-best"
-#     - "vpp-3n-icx-curr-iter-best"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -5491,8 +4161,6 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -5518,8 +4186,6 @@
     - "{DIR[DTR,MRR,VPP,2N,SKX]}"
     - "{DIR[DTR,MRR,VPP,3N,SKX]}"
     - "{DIR[DTR,MRR,VPP,2N,CLX]}"
-#     - "{DIR[DTR,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTR,MRR,VPP,3N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTR,MRR,VPP,3N,TSH]}"
     - "{DIR[DTR,MRR,VPP,2N,TX2]}"
@@ -5529,8 +4195,6 @@
     - "vpp-2n-skx-curr-iter-mrr"
     - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
-#     - "vpp-2n-icx-curr-iter-mrr"
-#     - "vpp-mrr-results-3n-icx"
     - "vpp-2n-zn2-curr-iter-mrr"
     - "vpp-3n-tsh-curr-iter-mrr"
     - "vpp-2n-tx2-curr-iter-mrr"
@@ -5557,8 +4221,6 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -5584,8 +4246,6 @@
     - "{DIR[DTC,MRR,VPP,2N,SKX]}"
     - "{DIR[DTC,MRR,VPP,3N,SKX]}"
     - "{DIR[DTC,MRR,VPP,2N,CLX]}"
-#     - "{DIR[DTC,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTC,MRR,VPP,3N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTC,MRR,VPP,3N,TSH]}"
     - "{DIR[DTC,MRR,VPP,2N,TX2]}"
@@ -5595,8 +4255,6 @@
     - "vpp-2n-skx-curr-iter-mrr"
     - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
-#     - "vpp-2n-icx-curr-iter-mrr"
-#     - "vpp-mrr-results-3n-icx"
     - "vpp-2n-zn2-curr-iter-mrr"
     - "vpp-3n-tsh-curr-iter-mrr"
     - "vpp-2n-tx2-curr-iter-mrr"
@@ -5623,8 +4281,6 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -5641,103 +4297,23 @@
       - "vic1227"
       - "vic1385"
 
-# VPP Device Results - Ubuntu
-- type: "file"
-  title: "VPP Device Results - Ubuntu"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
-  data-start-level: 4
-
-# VPP Device Configuration - Ubuntu
-- type: "file"
-  title: "VPP Device Configuration - Ubuntu"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 3n-skx
-- type: "file"
-  title: "DPDK Performance Results 3n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  data: "dpdk-3n-skx-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 2n-skx
-- type: "file"
-  title: "DPDK Performance Results 2n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  data: "dpdk-2n-skx-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 2n-zn2
-- type: "file"
-  title: "DPDK Performance Results 2n-zn2"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,ZN2]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,ZN2]}"
-  data: "dpdk-2n-zn2-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 2n-clx
-- type: "file"
-  title: "DPDK Performance Results 2n-clx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
-  data: "dpdk-2n-clx-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
-## DPDK Performance Results 2n-dnv
-#- type: "file"
-#  title: "DPDK Performance Results 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
-#  dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
-#  data: "dpdk-perf-results-2n-dnv"
-#  filter: "all"
-#  data-start-level: 4
+# # VPP Device Results - Ubuntu
+# - type: "file"
+#   title: "VPP Device Results - Ubuntu"
+#   algorithm: "file_test_results"
+#   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+#   dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+#   data: "vpp-device-results-ubuntu"
+#   filter: "all"
+#   data-start-level: 4
 #
-## DPDK Performance Results 3n-dnv
-#- type: "file"
-#  title: "DPDK Performance Results 3n-dnv"
-#  algorithm: "file_test_results"
-#  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
-#  dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
-#  data: "dpdk-perf-results-3n-dnv"
-#  filter: "all"
-#  data-start-level: 4
-
-# DPDK Performance Results 3n-tsh
-- type: "file"
-  title: "DPDK Performance Results 3n-tsh"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
-  data: "dpdk-3n-tsh-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
-# # DPDK Performance Results 2n-tx2
+# # VPP Device Configuration - Ubuntu
 # - type: "file"
-#   title: "DPDK Performance Results 2n-tx2"
+#   title: "VPP Device Configuration - Ubuntu"
 #   algorithm: "file_test_results"
-#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-#   dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-#   data: "dpdk-2n-tx2-curr-iter-best"
+#   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+#   dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+#   data: "vpp-device-results-ubuntu"
 #   filter: "all"
 #   data-start-level: 4
 
@@ -5745,631 +4321,6 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
-# VSAP tests 2n-clx
-
-- type: "plot"
-  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
-  layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
-  layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
-  layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
-  layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
-  layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
-  layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
-  layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
-  layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-# Hoststack tests 3n-skx
-
-- type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3-bps"
-  data: "vpp-3n-skx-curr-iter-hoststack"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
-  layout:
-    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps"
-  data: "vpp-3n-skx-curr-iter-hoststack"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpbase-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps"
-  layout:
-    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho-bps"
-  data: "vpp-3n-skx-curr-iter-hoststack"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicbase-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
-  layout:
-    title: "3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho"
-    layout: "plot-hoststack"
-
-################################################################################
-
-# Soak Test (PLRsearch), boxes - 2n-clx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
-  data: "vpp-2n-clx-curr-soak"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak Test (PLRsearch), boxes - 2n-clx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
-  data: "vpp-2n-clx-curr-soak"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak Test (PLRsearch), boxes - 2n-skx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-1"
-  data: "vpp-2n-skx-curr-soak"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak Test (PLRsearch), boxes - 2n-skx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-2"
-  data: "vpp-2n-skx-curr-soak"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-###############################################################################
-
-# Reconf tests 2n-skx
-
-- type: "plot"
-  title: "NFV Effective Blocked Time: 2n-skx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
-  algorithm: "plot_nf_reconf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
-  data: "vpp-2n-skx-curr-nfv-reconf"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
-  layout:
-    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
-    layout: "plot-throughput"
-
-###############################################################################
-
-# Reconf tests 2n-clx
-
-- type: "plot"
-  title: "NFV Effective Blocked Time: 2n-clx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
-  algorithm: "plot_nf_reconf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
-  data: "vpp-2n-clx-curr-nfv-reconf"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-  layout:
-    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
-    layout: "plot-throughput"
-
-###############################################################################
-
-# Plots - NF Density - 2n-skx - VSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-mrr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - VSC - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - VSC vxlan - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-mrr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - VSC vxlan - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-skx - CSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-mrr"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - CSC - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-skx - CSP - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-mrr"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - CSP - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-clx - VSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-mrr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-clx - VSC - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-clx - VSC vxlan - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-mrr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-clx - VSC vxlan - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-clx - CSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-mrr"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-clx - CSC - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-clx - CSP - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-mrr"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-clx - CSP - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "vpp-2n-clx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-################################################################################
-
 # Packet Throughput
 
 - type: "plot"
@@ -6435,7 +4386,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-skx-curr-iter"
@@ -6447,7 +4398,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -6884,7 +4835,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-skx-curr-iter"
@@ -6896,7 +4847,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -7017,7 +4968,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-dnv-x553-78b-{core}-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+  title: "Throughput: 2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-{core}-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
   data: "vpp-2n-dnv-curr-iter"
@@ -7134,7 +5085,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-skx-curr-iter"
@@ -7146,7 +5097,7 @@
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -7843,7 +5794,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-skx-curr-iter"
@@ -7854,7 +5805,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -8181,7 +6132,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-skx-curr-iter"
@@ -8192,7 +6143,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -8323,7 +6274,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-skx-curr-iter"
@@ -8334,7 +6285,7 @@
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -8783,7 +6734,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-dnv-curr-iter"
@@ -8794,7 +6745,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+    title: "2n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -9091,128 +7042,6 @@
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
-
-# Packet Throughput - DPDK
-
-# 2n-skx
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-skx-xxv710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-skx-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-skx-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-skx-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-# 3n-skx
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-skx-xxv710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-skx-xxv710-64b-{core}-base-{test_type}"
-  data: "dpdk-3n-skx-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-skx-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-skx-x710-64b-{core}-base-{test_type}"
-  data: "dpdk-3n-skx-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-## 2n-dnv-x553
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-dnv-x553-64b-{core}-base-{test_type}"
-#  algorithm: "plot_ndrpdr_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-{core}-base-{test_type}"
-#  data: "plot-dpdk-throughput-latency-2n-dnv"
-#  core: ["1t1c", "2t2c"]
-#  test-type: ["ndr", "pdr"]
-#  include:
-#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-dnv-x553-64b-{core}-base-{test_type}"
-#    layout: "plot-throughput"
-#
-## 3n-dnv-x553
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 3n-dnv-x553-64b-{core}-base-{test_type}"
-#  algorithm: "plot_ndrpdr_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-{core}-base-{test_type}"
-#  data: "plot-dpdk-throughput-latency-3n-dnv"
-#  core: ["1t1c", "2t2c"]
-#  test-type: ["ndr", "pdr"]
-#  include:
-#    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-{core}-base-{test_type}"
-#    layout: "plot-throughput"
-
-# 3n-tsh-x520
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-tsh-x520-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-{core}-base-{test_type}"
-  data: "dpdk-3n-tsh-curr-iter"
-  core: ["1t1c", "2t2c"]
-  include:
-    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-# 2n-tx2-xl710
-
-# - type: "plot"
-#   title: "DPDK Throughput: 2n-tx2-xl710-64b-{core}-base-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-{core}-base-{test_type}"
-#   data: "dpdk-2n-tx2-curr-iter"
-#   core: ["1t1c", "2t2c"]
-#   include:
-#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#   layout:
-#     title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
-#     layout: "plot-throughput"
-
-################################################################################
 ###   2n-clx                                                                 ###
 ################################################################################
 
@@ -9264,7 +7093,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-clx-curr-iter"
@@ -9276,7 +7105,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -9562,7 +7391,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-clx-curr-iter"
@@ -9575,7 +7404,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -9653,7 +7482,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-x710-64b-{core}-l2switching-base-scale-[avf,af_xdp]-{test_type}"
+  title: "Throughput: 2n-clx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-scale-[avf,af_xdp]-{test_type}"
   data: "vpp-2n-clx-curr-iter"
@@ -9663,7 +7492,7 @@
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-{core}-l2switching-base-scale-[avf,af_xdp]-{test_type}"
+    title: "2n-clx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -9868,7 +7697,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-clx-curr-iter"
@@ -9879,7 +7708,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -10150,7 +7979,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-clx-curr-iter"
@@ -10162,7 +7991,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -10236,7 +8065,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-x710-64b-l2switching-base-scale-[avf,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-clx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-l2switching-base-scale-[avf,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-clx-curr-iter"
@@ -10245,7 +8074,7 @@
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-l2switching-base-scale-[avf,af_xdp]-{test_type}"
+    title: "2n-clx-x710-64b-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -10393,495 +8222,6 @@
     title: "2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-# 2n-icx
-
-- type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "vpp-2n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "vpp-2n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "vpp-2n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "vpp-2n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "vpp-2n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "vpp-2n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-2n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-2n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-2n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-# 3n-icx
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.1518b-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.1518b-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-  data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.imix-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.imix-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.1518b-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.1518b-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
-  data: "vpp-3n-icx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.imix-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.imix-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Throughput - DPDK
-
-# 2n-clx
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-xxv710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-clx-curr-iter"
-  core: ["1t2c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-clx-curr-iter"
-  core: ["1t2c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
 ###############################################################################
 
 # 2n-zn2
@@ -10934,7 +8274,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-zn2-curr-iter"
@@ -10946,7 +8286,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -11211,7 +8551,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   data: "vpp-2n-zn2-curr-iter"
@@ -11223,7 +8563,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -11298,7 +8638,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  title: "Throughput: 2n-zn2-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-l2switching-base-scale-{test_type}"
   data: "vpp-2n-zn2-curr-iter"
@@ -11309,7 +8649,7 @@
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-zn2-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -11517,7 +8857,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-zn2-curr-iter"
@@ -11528,7 +8868,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -11759,7 +9099,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-zn2-curr-iter"
@@ -11770,7 +9110,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -11841,7 +9181,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-l2switching-base-scale-{test_type}-tsa"
   data: "vpp-2n-zn2-curr-iter"
@@ -11851,7 +9191,7 @@
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+    title: "2n-zn2-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -12002,36 +9342,6 @@
     title: "2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Throughput - DPDK
-
-# 2n-zn2
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-zn2-xxv710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-zn2-xxv710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-zn2-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-zn2-x710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-zn2-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
 ################################################################################
 
 - type: "plot"
@@ -12090,28 +9400,6 @@
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-icx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-icx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_icx.rst"
-  target-links: "../../_static/vpp"
-  data: "vpp-2n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: 3n-icx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-icx"
-  output-file-links: "{DIR[LAT,VPP]}/3n_icx.rst"
-  target-links: "../../_static/vpp"
-  data: "vpp-3n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
   title: "Latency by percentile: 3n-tsh"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-tsh"
@@ -12132,116 +9420,3 @@
   filter: "'1T1C' and 'NIC_Intel-XL710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: DPDK 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,DPDK]}/2n_skx.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-2n-skx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: DPDK 3n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-skx"
-  output-file-links: "{DIR[LAT,DPDK]}/3n_skx.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-3n-skx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: DPDK 2n-clx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-clx"
-  output-file-links: "{DIR[LAT,DPDK]}/2n_clx.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-2n-clx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: DPDK 2n-zn2"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-zn2"
-  output-file-links: "{DIR[LAT,DPDK]}/2n_zn2.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-2n-zn2-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: DPDK 3n-tsh"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-tsh"
-  output-file-links: "{DIR[LAT,DPDK]}/3n_tsh.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-3n-tsh-curr-iter-best"
-  filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-# - type: "plot"
-#   title: "Latency by percentile: DPDK 2n-tx2"
-#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-#   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
-#   output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
-#   target-links: "../../_static/dpdk"
-#   data: "dpdk-2n-tx2-curr-iter-best"
-#   filter: "'1T1C' and 'NIC_Intel-XL710'"
-#   layout:
-#     layout: "plot-hdrh-latency-percentile-x-log"
-
-###############################################################################
-
-- type: "plot"
-  title: "Throughput: 2n-skx-128kb-{core}-ip4routing-iperf3"
-  algorithm: "plot_mrr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-128kb-{core}-ip4routing-iperf3"
-  data: "vpp-2n-skx-curr-gso"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-iperf3-mrr"
-  layout:
-    title: "2n-skx-128kb-{core}-ip4routing-iperf3"
-    layout: "plot-throughput-gbps"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-128kb-{core}-ip4routing-iperf3"
-  algorithm: "plot_mrr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-128kb-{core}-ip4routing-iperf3"
-  data: "vpp-2n-clx-curr-iter-gso"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-iperf3-mrr"
-  layout:
-    title: "2n-clx-128kb-{core}-ip4routing-iperf3"
-    layout: "plot-throughput-gbps"
-
-- type: "plot"
-  title: "Throughput: 2n-zn2-128kb-{core}-ip4routing-iperf3"
-  algorithm: "plot_mrr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-128kb-{core}-ip4routing-iperf3"
-  data: "vpp-2n-zn2-curr-iter-gso"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-iperf3-mrr"
-  layout:
-    title: "2n-zn2-128kb-{core}-ip4routing-iperf3"
-    layout: "plot-throughput-gbps"
diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py
index 4ad4d94855..c09b406047 100644
--- a/resources/tools/presentation/sphinx_conf/report/conf.py
+++ b/resources/tools/presentation/sphinx_conf/report/conf.py
@@ -46,8 +46,8 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
-report_week = u'31'
-project = u'FD.io CSIT-2106.{week}'.format(week=report_week)
+report_week = u'33'
+project = u'FD.io CSIT-2101.1.{week}'.format(week=report_week)
 copyright = u'2021, FD.io'
 author = u'FD.io CSIT'
 
@@ -121,13 +121,13 @@ rst_epilog = u"""
 .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu2004-x86_64/
 .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/fdio.infra.ansible?h={release}
 .. _VPP startup.conf: https://git.fd.io/vpp/tree/src/vpp/conf/startup.conf?h=stable/{srelease}&id={vpp_release_commit_id}
-""".format(release=u'rls2106',
+""".format(release=u'rls2101.1',
            report_week=report_week,
            prev_release=u'rls2101',
-           srelease=u'2106',
-           csitrelease=u'2106',
+           srelease=u'2101_1',
+           csitrelease=u'2101.1',
            csit_prev_release=u'2101',
-           vpprelease=u'21.06',
+           vpprelease=u'21.01.1',
            vpp_prev_release=u'21.01',
            dpdkrelease=u'21.02',
            dpdk_prev_release=u'20.11',
author	Tibor Frank <tifrank@cisco.com>	2021-08-10 14:20:18 +0200
committer	Tibor Frank <tifrank@cisco.com>	2021-08-18 09:40:58 +0200
commit	19306c5878a420251eef752ed95dfafe53d269de (patch)
tree	9a164c043ff3bf7c35da5024baaa40a49022e5fd
parent	082e8560f2428bb8697345ba4cbe0581cdd5fcdc (diff)