os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - 3n-skx:
                 os: 'ubuntu2004'
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
       - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
           node-arch:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - -2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - -3n-skx:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - -3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-verify-{stream}-{node-arch}':
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - 3n-skx:
                 os: 'ubuntu2004'
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
           stream:
             - master:
                 executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
             - -2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
             - -2n-zn2:
                 executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
             - -2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
                 periodicity: '0 14 * * *'
             - -3n-skx:
                 executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
             - -3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
             - -3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
                 periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - 3n-skx:
                 os: 'ubuntu2004'
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
       - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - 3n-skx:
                 os: 'ubuntu2004'
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
       - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - 3n-skx:
                 os: 'ubuntu2004'
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
       - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
             - 3n-skx:
                 os: 'ubuntu2004'
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-dnv:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu1804'
+                os: 'ubuntu2004'
                 executor-arch: 'aarch64'
 
     project: 'csit'