diff --git a/Tools/Tier0ChainTests/test/test_q220_mp.sh b/Tools/Tier0ChainTests/test/test_q220_mp.sh
index 0ab3fea359cd1dcb31cc309d6db6c2c463033af2..b404fc6606513a21f8472b8a39426dec9c5c0b1a 100755
--- a/Tools/Tier0ChainTests/test/test_q220_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q220_mp.sh
@@ -7,6 +7,7 @@
 # art-include: master/Athena
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q220 --athenaopts='--nprocs=2' --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
 echo "art-result: $?"
diff --git a/Tools/Tier0ChainTests/test/test_q220_mt.sh b/Tools/Tier0ChainTests/test/test_q220_mt.sh
index 8d00ae6d8a2ccf86a5d8ea6da5cc69f1cdfcc6b5..78d87f9cb3f1cde6c079f77dbcd86f9ec1f78ae1 100755
--- a/Tools/Tier0ChainTests/test/test_q220_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_q220_mt.sh
@@ -2,11 +2,8 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q220 --athenaopts='--threads=1' --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False
 echo "art-result: $?"
diff --git a/Tools/Tier0ChainTests/test/test_q221_mp.sh b/Tools/Tier0ChainTests/test/test_q221_mp.sh
index 679fcf87c8f0b6dd713c23196fffd12cf8c6a961..a2e3ba9f6eee53dceab8e6d07ff4dca5a1e3387b 100755
--- a/Tools/Tier0ChainTests/test/test_q221_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q221_mp.sh
@@ -7,6 +7,7 @@
 # art-include: master/Athena
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q221 --athenaopts='--nprocs=2' --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False  --preExec="all:from IOVDbSvc.CondDB import conddb; conddb.addOverride('/PIXEL/PixMapOverlay','PixMapOverlay-SIM-MC16-000-03');" 
 echo "art-result: $? Reco"
diff --git a/Tools/Tier0ChainTests/test/test_q221_mt.sh b/Tools/Tier0ChainTests/test/test_q221_mt.sh
index 76b3d511b6dae22f310c887606d050f8a79330a2..74052fae96f1273f3e58191e1c4431f0afe867a1 100755
--- a/Tools/Tier0ChainTests/test/test_q221_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_q221_mt.sh
@@ -2,11 +2,8 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q221 --athenaopts='--threads=1' --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False  --preExec="all:from IOVDbSvc.CondDB import conddb; conddb.addOverride('/PIXEL/PixMapOverlay','PixMapOverlay-SIM-MC16-000-03');"
 echo "art-result: $? Reco"
diff --git a/Tools/Tier0ChainTests/test/test_q223_mp.sh b/Tools/Tier0ChainTests/test/test_q223_mp.sh
index b61face0f6eb90fc105beee095e5a99cd96c922d..74cf91e960f0607abb20638b75d214fb7c029e14 100755
--- a/Tools/Tier0ChainTests/test/test_q223_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q223_mp.sh
@@ -7,6 +7,7 @@
 # art-include: master/Athena
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q223 --athenaopts='--nprocs=2' --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
 echo "art-result: $? Reco"
diff --git a/Tools/Tier0ChainTests/test/test_q223_mt.sh b/Tools/Tier0ChainTests/test/test_q223_mt.sh
index 15d69d1b0f57c33ced8a67c9c795ddf20dddcea5..43dbbda69573eca8b3b10618c39b60102e911f46 100755
--- a/Tools/Tier0ChainTests/test/test_q223_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_q223_mt.sh
@@ -2,11 +2,8 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q223 --athenaopts='--threads=1' --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False
 echo "art-result: $? Reco"
diff --git a/Tools/Tier0ChainTests/test/test_q431_mp.sh b/Tools/Tier0ChainTests/test/test_q431_mp.sh
index c3682da02683f638dfe30715b740bf2ea620f30e..bafb7fa6b40425deca391cce290a44518bbe09d8 100755
--- a/Tools/Tier0ChainTests/test/test_q431_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q431_mp.sh
@@ -7,6 +7,7 @@
 # art-include: master/Athena
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q431 --athenaopts='--nprocs=2' --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False --maxEvents=1000
 echo "art-result: $? Reco"
diff --git a/Tools/Tier0ChainTests/test/test_q431_mt.sh b/Tools/Tier0ChainTests/test/test_q431_mt.sh
index a755a1d7b1f1f7f0a78e99d775e795c1e6c564c6..a4de91f041acb768755f0d33d27a98ade9397422 100755
--- a/Tools/Tier0ChainTests/test/test_q431_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_q431_mt.sh
@@ -2,11 +2,8 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q431 --athenaopts='--threads=2' --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False --maxEvents=1000
 echo "art-result: $? Reco"
diff --git a/Tools/Tier0ChainTests/test/test_q441_mp.sh b/Tools/Tier0ChainTests/test/test_q441_mp.sh
index 10a25f938818df436a3b71692385adc714055164..a3083fb141d0c7da00d9c2cd6ce8f9ed957d5d2d 100755
--- a/Tools/Tier0ChainTests/test/test_q441_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q441_mp.sh
@@ -3,6 +3,7 @@
 # art-description: RecoTrf
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q441 --athenaopts='--nprocs=2' --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q441/22.0/HITS.12560240._000299.pool.root.1 --inputRDO_BKGFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q441/22.0/RDO.17190395._000013.pool.root.1 --maxEvents=25 --outputAODFile=q441.AOD.pool.root --outputESDFile=q441.ESD.pool.root
 
diff --git a/Tools/Tier0ChainTests/test/test_q441_mt.sh b/Tools/Tier0ChainTests/test/test_q441_mt.sh
index d78498e6688966ecd08cad576c19041f1aa66525..64ed500504aa001aa116f64bbbf22e772410bda9 100755
--- a/Tools/Tier0ChainTests/test/test_q441_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_q441_mt.sh
@@ -3,6 +3,7 @@
 # art-description: RecoTrf
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 8
 
 Reco_tf.py --AMI=q441 --athenaopts='--threads=1' --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q441/22.0/HITS.12560240._000299.pool.root.1 --inputRDO_BKGFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q441/22.0/RDO.17190395._000013.pool.root.1 --maxEvents=25 --outputAODFile=q441.AOD.pool.root --outputESDFile=q441.ESD.pool.root