diff --git a/test_schedule2.xml b/test_schedule2.xml
index 1467b917248a87a5c2291a952de9347154f39587..ce49f695b5c7f7d1b93e010afb5bc35c518ac6f1 100644
--- a/test_schedule2.xml
+++ b/test_schedule2.xml
@@ -10,6 +10,7 @@
     or submit itself to any jurisdiction.
 -->
 <periodictests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="TestSchedule.xsd">
+  <!-- Simulation GEANT4 tests -->
   <periodictest>
     <schedule type="week" time="12:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
     <slot>lhcb-sim10-g4-v10r7</slot>
@@ -73,6 +74,7 @@
     <os_label>perf-el9</os_label>
     <count>1</count>
   </periodictest>
+  <!-- Misc simulation tests -->
   <periodictest>
     <schedule type="week" time="17:00">Wed</schedule>
     <slot>lhcb-sim10-dev</slot>
@@ -172,6 +174,43 @@
     <os_label>perf-el9</os_label>
     <count>1</count>
   </periodictest>
+  <periodictest>
+    <schedule type="week" time="12:00">Sat</schedule>
+    <slot>lhcb-sim10-g4-v10r7</slot>
+    <project>Gauss</project>
+    <platform>x86_64_v2-centos7-gcc11-opt</platform>
+    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
+    <os_label>perf-el9</os_label>
+    <count>1</count>
+  </periodictest>
+  <periodictest>
+    <schedule type="week" time="12:00">Sat</schedule>
+    <slot>lhcb-sim10-dev</slot>
+    <project>Gauss</project>
+    <platform>x86_64_v2-centos7-gcc11-opt</platform>
+    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
+    <os_label>perf-el9</os_label>
+    <count>1</count>
+  </periodictest>
+  <periodictest>
+    <schedule type="week" time="12:00">Sat</schedule>
+    <slot>lhcb-sim10</slot>
+    <project>Gauss</project>
+    <platform>x86_64_v2-centos7-gcc11-opt</platform>
+    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
+    <os_label>perf-el9</os_label>
+    <count>1</count>
+  </periodictest>
+  <periodictest>
+    <schedule type="week" time="12:00">Sat</schedule>
+    <slot>lhcb-sim09-cmake</slot>
+    <project>Gauss</project>
+    <platform>x86_64-slc6-gcc49-opt</platform>
+    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
+    <os_label>perf</os_label>
+    <count>1</count>
+  </periodictest>
+  <!-- Simulation generators tests -->
   <periodictest>
     <schedule type="week" time="12:00">Mon</schedule>
     <slot>lhcb-sim10-dev</slot>
@@ -424,6 +463,7 @@
     <os_label>perf</os_label>
     <count>1</count>
   </periodictest>
+  <!-- Simulation validation tests -->
   <periodictest>
     <schedule type="week" time="12:00">Mon</schedule>
     <slot>lhcb-sim10-dev</slot>
@@ -748,42 +788,7 @@
     <os_label>perf-el9</os_label>
     <count>1</count>
   </periodictest>
-  <periodictest>
-    <schedule type="week" time="12:00">Sat</schedule>
-    <slot>lhcb-sim10-g4-v10r7</slot>
-    <project>Gauss</project>
-    <platform>x86_64_v2-centos7-gcc11-opt</platform>
-    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="12:00">Sat</schedule>
-    <slot>lhcb-sim10-dev</slot>
-    <project>Gauss</project>
-    <platform>x86_64_v2-centos7-gcc11-opt</platform>
-    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="12:00">Sat</schedule>
-    <slot>lhcb-sim10</slot>
-    <project>Gauss</project>
-    <platform>x86_64_v2-centos7-gcc11-opt</platform>
-    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="12:00">Sat</schedule>
-    <slot>lhcb-sim09-cmake</slot>
-    <project>Gauss</project>
-    <platform>x86_64-slc6-gcc49-opt</platform>
-    <test runner="lhcbpr" group="GAUSS-MuonMSc" env="lb-run|MuonMoniPLHandler" />
-    <os_label>perf</os_label>
-    <count>1</count>
-  </periodictest>
+  <!-- Simulation detailed timing in Geant4 volumes tests -->
   <periodictest>
     <schedule type="week" time="12:00">Sat</schedule>
     <slot>lhcb-sim10-g4-v10r7</slot>
@@ -955,6 +960,7 @@
     <os_label>perf-el9</os_label>
     <count>1</count>
   </periodictest>
+  <!-- Simulation metrics tests -->
   <periodictest>
     <schedule type="week" time="15:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
     <slot>lhcb-sim10-dev</slot>
@@ -1162,6 +1168,7 @@
     <os_label>perf-el9</os_label>
     <count>3</count>
   </periodictest>
+  <!-- Digitisation tests -->
   <periodictest>
     <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
     <slot>lhcb-master</slot>
@@ -1297,294 +1304,7 @@
     <os_label>perf-el9</os_label>
     <count>1</count>
   </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10-Up02_SMOG2_pHe" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10-Up02_SMOG2_pp_pHe" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_def_Allen" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_def_Allen" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_def_Allen" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_def_Allen_Seed" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_def_Allen_Seed" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_def_Allen_Seed" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_def_Allen_TrackEff" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler,PrCheckerSummaryHLT1Handler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_def_Allen_TrackEff" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler,PrCheckerSummaryHLT1Handler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_def_Allen_TrackEff" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler,PrCheckerSummaryHLT1Handler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10bDigi16_SMOG2_pAr_def_Allen" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10bDigi16_SMOG2_pAr_def_Allen_Seed" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10bDigi16_SMOG2_ppAr_def_Allen" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13+detdesc-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Sim10bDigi16_SMOG2_ppAr_def_Allen_Seed" env="lb-run-gaudirun|HashRemoveHandler,DataChallengesROOTFileHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bd2Kstgamma_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Dst2D0pi_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Z2mumu_default_noUT_lowlumi" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bd2Kstgamma_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Dst2D0pi_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Z2mumu_fastest_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_legacy_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Dst2D0pi_legacy_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_legacy_withUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
+  <!-- RTA DataChallanges tests -->
   <periodictest>
     <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
     <slot>lhcb-master</slot>
@@ -1594,240 +1314,6 @@
     <os_label>perf-el9</os_label>
     <count>1</count>
   </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v3-el9-gcc13-opt+g</platform>
-    <test runner="lhcbpr" group="DC_Data2022_NoBias_commissioning_2022" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-dbg</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_fastest_250k" env="lb-run-gaudirun|RootFilesHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-dbg</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_LowLumi_250k" env="lb-run-gaudirun|RootFilesHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-dbg</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_fastest_250k" env="lb-run-gaudirun|RootFilesHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-dbg</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_fastest_250k" env="lb-run-gaudirun|RootFilesHandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bd2Kstgamma_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Dst2D0pi_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Z2mumu_fastest_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_B2Kstee_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bd2Kstgamma_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2JPsiPhi_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Dst2D0pi_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Z2mumu_default_noUT_lowlumi_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2Jpsiphi_legacy_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Dst2D0pi_legacy_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13+detdesc-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_legacy_withUT_20k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_DD4HEP_default_noUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_DD4HEP_default_noUT" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_MinBias_DD4HEP_default_noUT_10k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
-  <periodictest>
-    <schedule type="week" time="05:00">Sat</schedule>
-    <slot>lhcb-master</slot>
-    <project>Moore</project>
-    <platform>x86_64_v2-el9-gcc13-opt</platform>
-    <test runner="lhcbpr" group="DC_Sim10aU1_Bs2PhiPhi_DD4HEP_default_noUT_10k" env="lb-run-gaudirun|DataChallengesROOTFileHandler,PrCheckerSummaryHandler_withoutUT,PrCheckerCounterJSONhandler" />
-    <os_label>perf-el9</os_label>
-    <count>1</count>
-  </periodictest>
   <!-- The throughput test to run on every ci-test (and reference slots) -->
   <periodictest>
     <schedule type="week" time="13:45">Mon,Tue,Wed,Thu,Fri,Sat,Sun</schedule>