diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh
index 40bdbeb08a1e5e6015f26ae6534b381028713918..85bcc575d61bfb4f88d29451cfff64e9049e528b 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh
@@ -12,7 +12,7 @@ Reco_tf.py \
--maxEvents=50 \
--ignoreErrors=False \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0106._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh
index 9335a00148a0e14b28481fcc53d0ca714500ed16..7617f86163633c0635e9e933ef473f769461f681 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh
@@ -13,7 +13,7 @@ Reco_tf.py \
--ignoreErrors=False \
--steering=doRAWtoALL \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0106._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh
index 73b52c6b63c514092468107d488833bd4bf809d4..4b97e91f85aef657b2115531f242d748f3f87d66 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh
@@ -12,7 +12,7 @@ Reco_tf.py \
--maxEvents=50 \
--ignoreErrors=False \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0091._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh
index 2a6705abb5a3ad7dbf89cf04b82017d316667cae..4d42769c2b5556e065363580d21887babd540a1f 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh
@@ -12,7 +12,7 @@ Reco_tf.py \
--maxEvents=300 \
--ignoreErrors=False \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0093._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh
index 7a0cbbeafc9b2a6df28204dc3c436b78c215dcdf..f0fec7e6e011ba71851551e17c8ca4ea611b8adc 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh
@@ -12,7 +12,7 @@ Reco_tf.py \
--maxEvents=300 \
--ignoreErrors=False \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/expressstream_input_data18/data18_13TeV.00357750.express_express.merge.RAW._lb0095._SFO-ALL._0001.1 \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_express_0.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh
index 383487dfe829433cf304352b967e3989604cd19e..270e900a46f6ede1a4f981a84d4370a38b5e61eb 100755
--- a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh
@@ -16,7 +16,7 @@ Reco_tf.py \
--maxEvents=400 \
--ignoreErrors=False \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data18_13TeV.00357750.physics_Main.daq.RAW/data18_13TeV.00357750.physics_Main.daq.RAW._lb0114._SFO-5._0003.data \
---conditionsTag='CONDBR2-BLKPA-RUN2-02' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_Main_0.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh
index 0c3a5bd46d66195dab7cf8fb3f6b5b0baf934b19..103b30551fbdc8318dd9a5a93f30e2ba19c0a90e 100755
--- a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh
+++ b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh
@@ -16,7 +16,7 @@ Reco_tf.py \
--maxEvents=400 \
--ignoreErrors=False \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data18_13TeV.00357750.physics_Main.daq.RAW/data18_13TeV.00357750.physics_Main.daq.RAW._lb0114._SFO-5._0003.data \
---conditionsTag='CONDBR2-BLKPA-RUN2-02' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--outputESDFile=myESD_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q220.sh b/Tools/Tier0ChainTests/test/test_q220.sh
index f9face0dac84d7c9599dfd6162c226385183dc7e..35310e15e683cb5d3167eadef05dbc720951fd4b 100755
--- a/Tools/Tier0ChainTests/test/test_q220.sh
+++ b/Tools/Tier0ChainTests/test/test_q220.sh
@@ -12,7 +12,7 @@
Reco_tf.py \
--AMI=q220 \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--athenaopts='--threads=8' \
--maxEvents=800 \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q220_mp.sh b/Tools/Tier0ChainTests/test/test_q220_mp.sh
index 305c8fab865810bb81eee46a481b25cd65516593..795a588d09edfffc2041e6a1292d3830bb27691e 100755
--- a/Tools/Tier0ChainTests/test/test_q220_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q220_mp.sh
@@ -14,7 +14,7 @@ Reco_tf.py \
--AMI=q220 \
--athenaopts='--nprocs=2' \
--maxEvents=500 \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q220_mt1.sh b/Tools/Tier0ChainTests/test/test_q220_mt1.sh
index ad729b507270130e7ad4206ccb6c318bef37da5a..d2297ac565bc5303c47657b2b866efb33e95adff 100755
--- a/Tools/Tier0ChainTests/test/test_q220_mt1.sh
+++ b/Tools/Tier0ChainTests/test/test_q220_mt1.sh
@@ -5,6 +5,7 @@
Reco_tf.py \
--AMI=q220 \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--athenaopts='--threads=1' \
--maxEvents=100 \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q221.sh b/Tools/Tier0ChainTests/test/test_q221.sh
index 8d91a1f84872b4c8d197d878446a631b2f5e0af2..f9939169cb86f8e60380f75e4aba8fac587c79a6 100755
--- a/Tools/Tier0ChainTests/test/test_q221.sh
+++ b/Tools/Tier0ChainTests/test/test_q221.sh
@@ -12,6 +12,7 @@
Reco_tf.py \
--AMI=q221 \
--athenaopts='--threads=8' \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--preExec="all:from IOVDbSvc.CondDB import conddb; conddb.addOverride('/PIXEL/PixMapOverlay','PixMapOverlay-SIM-MC16-000-03');" \
--maxEvents=500 \
--outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q221_mp.sh b/Tools/Tier0ChainTests/test/test_q221_mp.sh
index d4f6cd41d1515fe0c67332490eba2842e54d4964..2fc09afda97053f0d14e5e28ba86c82e79be8971 100755
--- a/Tools/Tier0ChainTests/test/test_q221_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q221_mp.sh
@@ -7,6 +7,7 @@
Reco_tf.py \
--AMI=q221 \
--athenaopts='--nprocs=2' \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--preExec="all:from IOVDbSvc.CondDB import conddb; conddb.addOverride('/PIXEL/PixMapOverlay','PixMapOverlay-SIM-MC16-000-03');" \
--maxEvents=100 \
--outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q221_mt1.sh b/Tools/Tier0ChainTests/test/test_q221_mt1.sh
index a4dd74cc270ac573e56205c5cd36f2c8c7530a00..606daf5934226ae10a784ad9eba67679a9af0560 100755
--- a/Tools/Tier0ChainTests/test/test_q221_mt1.sh
+++ b/Tools/Tier0ChainTests/test/test_q221_mt1.sh
@@ -8,6 +8,7 @@
Reco_tf.py \
--AMI=q221 \
--athenaopts='--threads=1' \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--preExec="all:from IOVDbSvc.CondDB import conddb; conddb.addOverride('/PIXEL/PixMapOverlay','PixMapOverlay-SIM-MC16-000-03');" \
--maxEvents=100 \
--outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q223.sh b/Tools/Tier0ChainTests/test/test_q223.sh
index 14786666dd3d394abaedff8877b27a7a04bcc27a..e02c7b2d87e2a1af441512ef39bcbbafb0b74043 100755
--- a/Tools/Tier0ChainTests/test/test_q223.sh
+++ b/Tools/Tier0ChainTests/test/test_q223.sh
@@ -23,7 +23,7 @@ Reco_tf.py \
--preExec 'all:larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples3bins17phases");from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useBeamConstraint.set_Value_and_Lock(False);InDetFlags.doMinBias=True;InDetFlags.useDCS.set_Value_and_Lock(False);DQMonFlags.doMonitoring=True;DQMonFlags.doNewMonitoring=True;DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;DQMonFlags.doCTPMon=False;from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(False);' \
--postExec '' \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q223_input_data18/data18_comm.00353055.physics_MinBias.daq.RAW._lb0062._SFO-2._0001.data \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--maxEvents=500 \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q223_mp.sh b/Tools/Tier0ChainTests/test/test_q223_mp.sh
index eb747706874db3e6a0cae1f394e9e98e81722933..7ebb996e907afde8f30824a0a30276ffcd92f350 100755
--- a/Tools/Tier0ChainTests/test/test_q223_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q223_mp.sh
@@ -24,7 +24,7 @@ Reco_tf.py \
--preExec 'all:larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples3bins17phases");from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useBeamConstraint.set_Value_and_Lock(False);InDetFlags.doMinBias=True;InDetFlags.useDCS.set_Value_and_Lock(False);DQMonFlags.doMonitoring=True;DQMonFlags.doNewMonitoring=True;DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;DQMonFlags.doCTPMon=False;from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(False);' \
--postExec '' \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q223_input_data18/data18_comm.00353055.physics_MinBias.daq.RAW._lb0062._SFO-2._0001.data \
---conditionsTag='CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--maxEvents=500 \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q223_mt1.sh b/Tools/Tier0ChainTests/test/test_q223_mt1.sh
index d8a70ec7f5dc8b4282c9d65efabeb5bdb8ccc60f..9076a98b6f9fbc1a35e41875c466927585acede6 100755
--- a/Tools/Tier0ChainTests/test/test_q223_mt1.sh
+++ b/Tools/Tier0ChainTests/test/test_q223_mt1.sh
@@ -11,7 +11,7 @@ Reco_tf.py \
--AMI=q223 \
--preExec 'all:larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples3bins17phases");from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useBeamConstraint.set_Value_and_Lock(False);InDetFlags.doMinBias=True;InDetFlags.useDCS.set_Value_and_Lock(False);DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;DQMonFlags.doCTPMon=False;from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(False);' \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q223_input_data18/data18_comm.00353055.physics_MinBias.daq.RAW._lb0062._SFO-2._0001.data \
---conditionsTag='CONDBR2-BLKPA-RUN2-02' \
+--conditionsTag='CONDBR2-BLKPA-RUN2-06' \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--maxEvents=100 \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q431.sh b/Tools/Tier0ChainTests/test/test_q431.sh
index db7ae2c9552c6548b6a9249cb5238deaa2415012..e031f543324ca0f56705bb28d7fcadb2d207c628 100755
--- a/Tools/Tier0ChainTests/test/test_q431.sh
+++ b/Tools/Tier0ChainTests/test/test_q431.sh
@@ -11,7 +11,7 @@ Reco_tf.py \
--athenaopts='--threads=8' \
--maxEvents=500 \
--steering doRAWtoALL \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_q431_mp.sh b/Tools/Tier0ChainTests/test/test_q431_mp.sh
index e494229f0104408e9b69d87395808d36a7669a93..d0c26c41475a594892766b69512bf04437eab740 100755
--- a/Tools/Tier0ChainTests/test/test_q431_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q431_mp.sh
@@ -11,7 +11,7 @@ Reco_tf.py \
--athenaopts='--nprocs=2' \
--maxEvents=500 \
--steering doRAWtoALL \
---conditionsTag 'all:CONDBR2-BLKPA-RUN2-03' \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_q431_mt1.sh b/Tools/Tier0ChainTests/test/test_q431_mt1.sh
index 9b4de9bd3302f7415b46ccea43ff5898e101c2a1..c7ea9e5cb37a23b5ca71d8705b3bd6663941e1a0 100755
--- a/Tools/Tier0ChainTests/test/test_q431_mt1.sh
+++ b/Tools/Tier0ChainTests/test/test_q431_mt1.sh
@@ -6,6 +6,7 @@
Reco_tf.py \
--AMI=q431 \
--athenaopts='--threads=1' \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--maxEvents=100 \
--outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q440.sh b/Tools/Tier0ChainTests/test/test_q440.sh
index 5a991e31c683eafa2441b0e22c60d4959ac492fe..efc565261e146cd3c42e830c28e24c5b3efd8853 100755
--- a/Tools/Tier0ChainTests/test/test_q440.sh
+++ b/Tools/Tier0ChainTests/test/test_q440.sh
@@ -14,6 +14,7 @@
Reco_tf.py \
--AMI=q440 \
--athenaopts "RDOtoRDOTrigger:--threads=8" "RAWtoESD:--threads=8" "ESDtoAOD:--threads=8" \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--maxEvents=500 \
--outputRDOFile=myRDO.pool.root --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q440_mt1.sh b/Tools/Tier0ChainTests/test/test_q440_mt1.sh
index 5c4cef9070bd0ff781618703dd1b4f8fd852c88d..135598e47a6ea2e05cd2b58dd0c21a17ebdcbbf1 100755
--- a/Tools/Tier0ChainTests/test/test_q440_mt1.sh
+++ b/Tools/Tier0ChainTests/test/test_q440_mt1.sh
@@ -13,6 +13,7 @@
Reco_tf.py \
--AMI=q440 \
--athenaopts "RDOtoRDOTrigger:--threads=1" "RAWtoESD:--threads=1" "ESDtoAOD:--threads=1" \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--maxEvents=100 \
--outputRDOFile=myRDO.pool.root --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
diff --git a/Tools/Tier0ChainTests/test/test_q441.sh b/Tools/Tier0ChainTests/test/test_q441.sh
index 704285b71e1a7564d6dc96d9283bdb12c27ad438..b8956849b724ac114f7974aa093fedb7c83107d6 100755
--- a/Tools/Tier0ChainTests/test/test_q441.sh
+++ b/Tools/Tier0ChainTests/test/test_q441.sh
@@ -9,6 +9,7 @@
Reco_tf.py \
--AMI=q441 \
--athenaopts='--threads=8' \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--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=500 \
diff --git a/Tools/Tier0ChainTests/test/test_q441_mp.sh b/Tools/Tier0ChainTests/test/test_q441_mp.sh
index bdfec999184ab9b6227cc98a93dd8212f868f11f..cce893e3b9c8a2df14d6202bfdf4d6c4c5c6344f 100755
--- a/Tools/Tier0ChainTests/test/test_q441_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q441_mp.sh
@@ -4,7 +4,7 @@
# art-type: grid
# 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
+Reco_tf.py --AMI=q441 --conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' --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
#This test currently has the muon isolation reconstruction switched off. It should be switched back on at a later date.
echo "art-result: $?"
diff --git a/Tools/Tier0ChainTests/test/test_q441_mt1.sh b/Tools/Tier0ChainTests/test/test_q441_mt1.sh
index 921bbe968ade1f4562cefdd3addb7cf0698d6e0d..79c9cb5523aebb92c01c4f5fdf0a558b07cf96c7 100755
--- a/Tools/Tier0ChainTests/test/test_q441_mt1.sh
+++ b/Tools/Tier0ChainTests/test/test_q441_mt1.sh
@@ -8,6 +8,7 @@
Reco_tf.py \
--AMI=q441 \
--athenaopts='--threads=1' \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--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=100 \
diff --git a/Tools/Tier0ChainTests/test/test_recentrun_main_2018.sh b/Tools/Tier0ChainTests/test/test_recentrun_main_2018.sh
index 7de603917e7845bea3ef455e3ef0a0ed743091ad..668e9a7cc6ec00e25b05247b226759a1db46e372 100755
--- a/Tools/Tier0ChainTests/test/test_recentrun_main_2018.sh
+++ b/Tools/Tier0ChainTests/test/test_recentrun_main_2018.sh
@@ -13,6 +13,7 @@
Reco_tf.py \
--AMI=f1089 \
--athenaopts='--threads=8' \
+--conditionsTag 'all:CONDBR2-BLKPA-RUN2-06' \
--maxEvents=250 \
--outputESDFile=myESD_Main.pool.root --outputAODFile=myAOD_Main.AOD.pool.root --outputHISTFile=myMergedMonitoring_Main.root \
--ignoreErrors=False \
diff --git a/Tools/Tier0ChainTests/test/test_reco_mc16e.sh b/Tools/Tier0ChainTests/test/test_reco_mc16e.sh
index c74f11652af328a851a0fe35cb57149c44025054..9808dd69e7e469be915165a1ddf7609915300278 100755
--- a/Tools/Tier0ChainTests/test/test_reco_mc16e.sh
+++ b/Tools/Tier0ChainTests/test/test_reco_mc16e.sh
@@ -12,7 +12,7 @@
Reco_tf.py \
--athenaopts "RDOtoRDOTrigger:--threads=8" "RAWtoESD:--threads=8" "ESDtoAOD:--threads=8" \
--digiSteeringConf 'StandardSignalOnlyTruth' \
---conditionsTag 'default:OFLCOND-MC16-SDR-25' \
+--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-08' \
--valid 'True' \
--pileupFinalBunch '6' \
--numberOfHighPtMinBias '0.2595392' \
diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh
index 5b104d298a957af4a3641856d390e547c016ab06..f98d63275b9b93acc5b3e7b9339baa8c0bedd842 100755
--- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh
+++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh
@@ -9,7 +9,7 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-Reco_tf.py --conditionsTag all:CONDBR2-BLKPA-2017-05 --ignoreErrors 'False' --autoConfiguration='everything' --maxEvents '250' --geometryVersion all:ATLAS-R2-2015-04-00-00 --steering='doRAWtoALL' --inputBSFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00306451.physics_Main.daq.RAW._lb0948._SFO-4._0001.data' --outputDRAW_EGZFile 'myDRAW_EGZ.data' --outputDESDM_IDALIGNFile 'myDESDM_IDALIGN.pool.root' --outputDESDM_SGLELFile 'myDESDM_SGLEL.pool.root' --outputDESDM_SLTTMUFile 'myDESDM_SLTTMU.pool.root' --outputDAOD_IDTRKVALIDFile 'myDAOD_IDTRKVALID.pool.root' --outputDRAW_ZMUMUFile 'myDRAW_ZMUMU.data' --outputAODFile 'myAOD.pool.root' --outputDESDM_EGAMMAFile 'myDESDM_EGAMMA.pool.root' --outputDESDM_MCPFile 'myDESDM_MCP.pool.root' --outputDESDM_CALJETFile 'myDESDM_CALJET.pool.root' --outputDESDM_PHOJETFile 'myDESDM_PHOJET.pool.root' --outputDESDM_TILEMUFile 'myDESDM_TILEMU.pool.root' --outputDRAW_RPVLLFile 'myDRAW_RPVLL.data' --outputDESDM_EXOTHIPFile 'myDESDM_EXOTHIP.pool.root' --outputESDFile 'myESD.pool.root' --outputHISTFile 'myHIST.root' --outputDAOD_IDTIDEFile 'myDAOD_IDTIDE.pool.root' --imf False
+Reco_tf.py --conditionsTag all:CONDBR2-BLKPA-RUN2-06 --ignoreErrors 'False' --autoConfiguration='everything' --maxEvents '250' --geometryVersion all:ATLAS-R2-2015-04-00-00 --steering='doRAWtoALL' --inputBSFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00306451.physics_Main.daq.RAW._lb0948._SFO-4._0001.data' --outputDRAW_EGZFile 'myDRAW_EGZ.data' --outputDESDM_IDALIGNFile 'myDESDM_IDALIGN.pool.root' --outputDESDM_SGLELFile 'myDESDM_SGLEL.pool.root' --outputDESDM_SLTTMUFile 'myDESDM_SLTTMU.pool.root' --outputDAOD_IDTRKVALIDFile 'myDAOD_IDTRKVALID.pool.root' --outputDRAW_ZMUMUFile 'myDRAW_ZMUMU.data' --outputAODFile 'myAOD.pool.root' --outputDESDM_EGAMMAFile 'myDESDM_EGAMMA.pool.root' --outputDESDM_MCPFile 'myDESDM_MCP.pool.root' --outputDESDM_CALJETFile 'myDESDM_CALJET.pool.root' --outputDESDM_PHOJETFile 'myDESDM_PHOJET.pool.root' --outputDESDM_TILEMUFile 'myDESDM_TILEMU.pool.root' --outputDRAW_RPVLLFile 'myDRAW_RPVLL.data' --outputDESDM_EXOTHIPFile 'myDESDM_EXOTHIP.pool.root' --outputESDFile 'myESD.pool.root' --outputHISTFile 'myHIST.root' --outputDAOD_IDTIDEFile 'myDAOD_IDTIDE.pool.root' --imf False
rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
index 6d3b4b692104800ed14dba2af9bcb0ba624df6e1..b3a334b53f09d2793858fa6dc5b41bee383d7a41 100755
--- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
+++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
@@ -14,7 +14,7 @@
Reco_tf.py \
--AMI=f739 \
--preExec 'r2a:from InDetPrepRawDataToxAOD.SCTxAODJobProperties import SCTxAODFlags;SCTxAODFlags.Prescale.set_Value_and_Lock(50);from AthenaMonitoring.DQMonFlags import DQMonFlags; DQMonFlags.doHLTMon=False' \
---conditionsTag=CONDBR2-BLKPA-RUN2-03 \
+--conditionsTag=CONDBR2-BLKPA-RUN2-06 \
--geometryVersion='ATLAS-R2-2016-01-00-01' \
--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00304008.physics_Main.daq.RAW._lb0838._SFO-6._0001.data \
--outputDESDM_IDALIGNFile=IDALIGN_Main_0.pool.root --outputDESDM_SLTTMUFile=SLTTMU_Main_0.pool.root --outputDRAW_ZMUMUFile=ZMUMU_Main_0.data --outputDAOD_IDTIDEFile=IDTIDE_Main_0.AOD.pool.root --outputDESDM_MCPFile=MCP_Main_0.pool.root --outputDRAW_EGZFile=EGZ_Main_0.data --outputDESDM_PHOJETFile=PHOJET_Main_0.pool.root --outputDESDM_TILEMUFile=TILEMU_Main_0.pool.root --outputDRAW_RPVLLFile=RPVLL_Main_0.data --outputDAOD_IDTRKVALIDFile=IDTRKVALID_Main_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_Main_0.root --outputDESDM_EXOTHIPFile=EXOTHIP_Main_0.pool.root --outputDESDM_SGLELFile=SGLEL_Main_0.pool.root --maxEvents=500 --outputESDFile=myESD_Main_0.pool.root --outputDESDM_EGAMMAFile=EGAMMA_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --outputDESDM_CALJETFile=CALJET_Main_0.pool.root \