diff --git a/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20a_presampling_maketest.sh b/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20a_presampling_maketest.sh
index 08acdeb07b69e89553d9ccec07596b107fdabb14..5ea2a1d2ed32938d9d3a4d09b6e42ee390d594c1 100755
--- a/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20a_presampling_maketest.sh
+++ b/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20a_presampling_maketest.sh
@@ -10,7 +10,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20d_presampling_maketest.sh b/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20d_presampling_maketest.sh
index edb01fe0196cdd172c22011e88715589e30af20a..8d5de8c9ffef862115eddc78532f0d00181ab4c4 100755
--- a/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20d_presampling_maketest.sh
+++ b/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20d_presampling_maketest.sh
@@ -10,7 +10,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20e_presampling_maketest.sh b/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20e_presampling_maketest.sh
index f7b1eb299495d370ec6cc7cc90035c51463e9d48..464f39dd5287b81d828175d7c07216e24b5e1768 100755
--- a/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20e_presampling_maketest.sh
+++ b/Simulation/Tests/DigitizationTests/scripts/Digi_tf_mc20e_presampling_maketest.sh
@@ -10,7 +10,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh
index 58522330bd4ba9fe8cb8671a9a09892a153a6388..4abf7a5107ec6cc06f2cc8081452b0071f7c4adb 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh
@@ -18,7 +18,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 # config only
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -35,7 +35,7 @@ Digi_tf.py \
 
 # full run
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -61,7 +61,7 @@ if [ $rc -eq 0 ]
 then
     Digi_tf.py \
     --CA \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh
index e20089eb4d2ff51c5218999dddfb07cedf7dd636..4aa8581ff96bdee9853bd24e76980b25a3f2985f 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh
@@ -16,7 +16,7 @@ HSHitsFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/va
 
 # config only
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -31,7 +31,7 @@ Digi_tf.py \
 
 # full run
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -55,7 +55,7 @@ if [ $rc -eq 0 ]
 then
     Digi_tf.py \
     --CA \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_presampling.sh
index 987a09d3de2dabc0892140618a8f2a788c78e652..5fee799731cd206efd8e4ab41366da5ac56fa09c 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_presampling.sh
@@ -19,7 +19,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # config only
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -37,7 +37,7 @@ Digi_tf.py \
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -64,7 +64,7 @@ then
     Digi_tf.py \
     --CA \
     --PileUpPresampling True \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh
index c1b66d89c50be06f0fd92632727355f1d69c9c3e..afcf18b6e45ec8aeccd4054cfb66f21e6601bfc5 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh
@@ -15,7 +15,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh
index d1755e1426b1a13c3f0362fe6371b74b3101637f..cc9a6d2bf9ed52b5881a553f94fffc8470c1cc96 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh
@@ -18,7 +18,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 # config only
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -35,7 +35,7 @@ Digi_tf.py \
 
 # full run
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -61,7 +61,7 @@ if [ $rc -eq 0 ]
 then
     Digi_tf.py \
     --CA \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG_presampling.sh
index 304e182dd3e0fb8a09ba0ba1cd6c4ad1b290651e..3aa21535f9b3f1c7620d8d8495824d8c1b23ac60 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG_presampling.sh
@@ -19,7 +19,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # config only
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -37,7 +37,7 @@ Digi_tf.py \
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -64,7 +64,7 @@ then
     Digi_tf.py \
     --CA \
     --PileUpPresampling True \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh
index 4c40d3a6af144ef27376f843a4fe3ddad3e4dbd9..024682912834ea3875d42a85dac8c8dea5cc0f8f 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh
@@ -15,7 +15,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh
index 561e3db7339158346752c45bae4591de91065eab..bd35a469493f321e5210b3fd6bf715e24cae4042 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh
@@ -18,7 +18,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 # config only
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -35,7 +35,7 @@ Digi_tf.py \
 
 # full run
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -61,7 +61,7 @@ if [ $rc -eq 0 ]
 then
     Digi_tf.py \
     --CA \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh
index 32551076397ce35503057256fee8196d976e70f9..f5163e574d720516df0674cc148f774d34c9acd2 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh
@@ -16,7 +16,7 @@ HSHitsFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/va
 
 # config only
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -31,7 +31,7 @@ Digi_tf.py \
 
 # full run
 Digi_tf.py \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -55,7 +55,7 @@ if [ $rc -eq 0 ]
 then
     Digi_tf.py \
     --CA \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling.sh
index 762ef1d991788d47b6294ee9edb65a4296543438..b7df7318e5df4759b8930c8ee10278b315050648 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling.sh
@@ -19,7 +19,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # config only
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -37,7 +37,7 @@ Digi_tf.py \
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -64,7 +64,7 @@ then
     Digi_tf.py \
     --CA \
     --PileUpPresampling True \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh
index b473f192d59be8fe4399a9c72940445ccc6eee11..f3a1f72273d2dde050241ce460bde3ecad17d6d5 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh
@@ -19,7 +19,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 # config only
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -38,7 +38,7 @@ Digi_tf.py \
 # full run
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
@@ -66,7 +66,7 @@ then
     Digi_tf.py \
     --CA \
     --PileUpPresampling True \
-    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+    --conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
     --digiSeedOffset1 170 --digiSeedOffset2 170 \
     --digiSteeringConf "StandardSignalOnlyTruth" \
     --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh
index d2febbcef6b4f3bb764526c4a281c8ebdd588a7e..77c7e64d65f24dff1b8f25b5daada8ec3ffce721 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh
@@ -15,7 +15,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 Digi_tf.py \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf "StandardSignalOnlyTruth" \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh
index 718c202973593b51491c963c81528235a51b0666..b2cc28f670ec1beb6eb4b3578c48103c91596930 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh
@@ -13,7 +13,7 @@ export ATHENA_CORE_NUMBER=8
 Digi_tf.py \
 --multithreaded \
 --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 \
 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh
index fbe37aacf55d3cf0be6bb0b6e0f9ad5f15a9e7c2..8e14966d65c149b14c956ef6397cbbfa619ecf5a 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh
@@ -13,7 +13,7 @@ export ATHENA_CORE_NUMBER=1
 Digi_tf.py \
 --multithreaded \
 --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 \
 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh
index fa27a0135da952a17ed258613d441cf5a109c73e..649aebc5f9824e943d53c33ed07ac0dc3bdf85d1 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh
@@ -22,7 +22,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 Digi_tf.py \
 --PileUpPresampling True \
 --inputHITSFile ${InputHitsFile} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
@@ -44,7 +44,7 @@ Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 0 \
 --PileUpPresampling True \
 --inputHITSFile ${InputHitsFile} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
@@ -68,7 +68,7 @@ Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 1 \
 --PileUpPresampling True \
 --inputHITSFile ${InputHitsFile} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh
index 16b487a3e2cf2f58450f2d87118a1144bd750c7a..1aeae238689769a635116f3c4267777b02fad7a7 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh
@@ -21,7 +21,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
 
 Digi_tf.py \
 --inputHITSFile ${InputHitsFile} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
@@ -42,7 +42,7 @@ echo "art-result: $rc Digi_tf.py SP"
 Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 0 \
 --inputHITSFile ${InputHitsFile} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
@@ -65,7 +65,7 @@ echo "art-result: $rc2 Digi_tf.py MP fork after 0"
 Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 1 \
 --inputHITSFile ${InputHitsFile} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar.sh
index 5fa5a2f0af383ef37493eca00977ac393e659428..56780848c8d187bbcf4131d8b07569ad5c7cd594 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar.sh
@@ -25,7 +25,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -36,7 +36,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -56,7 +56,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh
index 99a3e0e5afc1dc2a786c163b277b0548be9c0bce..e5f05549dfd109d183e9e739bfe413b067d3bb3d 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh
index ef55863354e7e2f23fa22869f4338720c1ec3cfe..8cd6d36928f3e801db97925a6554d0ca4109f5a5 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh
index 50cc7bd9b22176e1a46c62a50290c2da79ed0bfd..4ed70166191cdcabd8a33e3cac400d97344f2657 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel.sh
index 57608dce1c0af30f5a1940a232f476f40b227f3a..8f5c9248d866569fa857c4560076d70804b34b6c 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh
index 485cd5166abd3ea2f89e57e167c3e0de2dd897a1..306709c97f029fd99b7b392c728e6e005d1a45f9 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh
index 2a2bf2b212cf5ccefa94174ce7850c2761824ab4..f101e95a4a1ed2c31c7817e2228c652a4be6e442 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh
index 3a6a246d6de8bf0c508e05d514c80be5ebb1b2e1..46122a5599f51b3898acc733f5857b77efd37af9 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh
index b8b0828df75b995de53292ec12536ae1ce8de4c1..17a6fecd522fae92309dd5ac8c5f24ec035132e0 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh
@@ -26,7 +26,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False \
@@ -38,7 +38,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile legacyMcOverlayRDO.pool.root \
 --maxEvents $events \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --postExec 'job+=CfgMgr.JobOptsDumperAlg(FileName="OverlayLegacyConfig.txt");' \
@@ -59,7 +59,7 @@ then
     --inputRDO_BKGFile ${RDO_BKG_File} \
     --outputRDOFile mcOverlayRDO.pool.root \
     --maxEvents $events \
-    --conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+    --conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
     --geometryVersion ATLAS-R2-2016-01-00-01 \
     --preInclude 'all:Campaigns.MC20e' \
     --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential.sh
index 367ecdc82f4e146f1a2e54da8c56b1fbe4af3730..ae09171e46c387c32cb0306c30f1ac17f0763c74 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential.sh
@@ -23,7 +23,7 @@ Overlay_tf.py \
 --inputRDO_BKGFile ${RDO_BKG_File} \
 --outputRDOFile mcOverlayRDO.pool.root \
 --maxEvents ${events} \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns.MC20e' \
 --postInclude 'OverlayConfiguration.OverlayTestHelpers.OverlayJobOptsDumperCfg' \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
index dfba234160b49792e096d0910c6666e153c54344..5baa8f6753f27691f6ef60f15b63e9e573c8e27c 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
@@ -20,7 +20,7 @@ Overlay_tf.py \
 --outputRDOFile MC_plus_MC.RDO.pool.root \
 --maxEvents ${events} \
 --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20a.py' \
 --imf False
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
index c4fe680aab7db76767a65ccbf4eccc94e9ca9bf4..f7e7421fd822ab960b8d6c93a86c9669f63b0bc2 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
@@ -17,7 +17,7 @@ Reco_tf.py \
 --autoConfiguration everything \
 --inputHITSFile ${HITS_File} \
 --inputRDO_BKGFile ${RDO_BKG_File} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --maxEvents ${events} --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
 --preInclude "all:Campaigns/MC20a.py" \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
index 9fda233a95d15817fdd4e015287411d90418d96f..a854d6d2d42542d433aa74a8eed9500596bd788f 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
@@ -20,7 +20,7 @@ Overlay_tf.py \
 --outputRDOFile MC_plus_MC.RDO.pool.root \
 --maxEvents ${events} \
 --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20d.py' \
 --imf False
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
index bf3892dec86e8f30fbcefa9ff805e72fad9f494c..9ed446b02944dd8a22f0908c8a5902d385f9cc27 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
@@ -17,7 +17,7 @@ Reco_tf.py \
 --autoConfiguration everything \
 --inputHITSFile ${HITS_File} \
 --inputRDO_BKGFile ${RDO_BKG_File} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --maxEvents ${events} --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
 --preInclude "all:Campaigns/MC20d.py" \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
index b940844b19acc035dfbcb2b27fcdba3f081bb986..6cdae25eada6d90f95892c9997f89b2930612aba 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
@@ -20,7 +20,7 @@ Overlay_tf.py \
 --outputRDOFile MC_plus_MC.RDO.pool.root \
 --maxEvents ${events} \
 --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
---conditionsTag OFLCOND-MC16-SDR-RUN2-08  \
+--conditionsTag OFLCOND-MC16-SDR-RUN2-09  \
 --geometryVersion ATLAS-R2-2016-01-00-01 \
 --preInclude 'all:Campaigns/MC20e.py' \
 --imf False
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
index 34c304d7fea7e41567f07be9bd03fe0d1314cdc7..a851378e90f4b9f098bf6c1a5ac030e84591d31b 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
@@ -17,7 +17,7 @@ Reco_tf.py \
 --autoConfiguration everything \
 --inputHITSFile ${HITS_File} \
 --inputRDO_BKGFile ${RDO_BKG_File} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-08 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --maxEvents ${events} --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
 --preInclude "all:Campaigns/MC20e.py" \
diff --git a/Tools/Campaigns/python/MC20.py b/Tools/Campaigns/python/MC20.py
index fd56abb5f59471627a3db2c50d096c81d8b2827e..d84fd6e0adaeae568564a39b571226f665c95f85 100644
--- a/Tools/Campaigns/python/MC20.py
+++ b/Tools/Campaigns/python/MC20.py
@@ -9,6 +9,8 @@ def MC20a(flags):
     flags.Beam.NumberOfCollisions = 20.
     flags.Digitization.InputBeamSigmaZ = 42
 
+    flags.Digitization.UseUpdatedTGCConditions = True
+
     LArConfigRun2PileUp(flags)
     flags.Digitization.HighGainEMECIW = True
 
@@ -36,6 +38,8 @@ def MC20d(flags):
     flags.Beam.NumberOfCollisions = 20.
     flags.Digitization.InputBeamSigmaZ = 42
 
+    flags.Digitization.UseUpdatedTGCConditions = True
+
     LArConfigRun2PileUp(flags)
 
     flags.Tile.BestPhaseFromCOOL = False
@@ -62,6 +66,8 @@ def MC20e(flags):
     flags.Beam.NumberOfCollisions = 20.
     flags.Digitization.InputBeamSigmaZ = 42
 
+    flags.Digitization.UseUpdatedTGCConditions = True
+
     LArConfigRun2PileUp(flags)
 
     flags.Tile.BestPhaseFromCOOL = False
@@ -88,6 +94,8 @@ def MC20NoPileUp(flags):
     flags.Beam.NumberOfCollisions = 0
     flags.Digitization.InputBeamSigmaZ = 42
 
+    flags.Digitization.UseUpdatedTGCConditions = True
+
     LArConfigRun2NoPileUp(flags)
 
     flags.Tile.BestPhaseFromCOOL = False
diff --git a/Tools/Campaigns/share/MC20NoPileUp.py b/Tools/Campaigns/share/MC20NoPileUp.py
index d4f1582b4b49954e0bb5e62d726e7850001c2ad5..7b5959034ab57ed9ba47de1a6aebd3109b1c50d4 100644
--- a/Tools/Campaigns/share/MC20NoPileUp.py
+++ b/Tools/Campaigns/share/MC20NoPileUp.py
@@ -5,6 +5,7 @@ bf.Beam.numberOfCollisions.set_Value_and_Lock(0)
 
 from Digitization.DigitizationFlags import digitizationFlags
 digitizationFlags.OldBeamSpotZSize = 42
+digitizationFlags.UseUpdatedTGCConditions = True
 
 from AthenaCommon.Resilience import protectedInclude
 protectedInclude('LArConfiguration/LArConfigRun2Old_NoPileup.py')
diff --git a/Tools/Campaigns/share/MC20a.py b/Tools/Campaigns/share/MC20a.py
index fb095ec84d2806c197f58b9565277c262f68606d..829ee9589fcf59b0b1b454823ef573e4d969bc5a 100644
--- a/Tools/Campaigns/share/MC20a.py
+++ b/Tools/Campaigns/share/MC20a.py
@@ -5,6 +5,7 @@ bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
 
 from Digitization.DigitizationFlags import digitizationFlags
 digitizationFlags.OldBeamSpotZSize = 42
+digitizationFlags.UseUpdatedTGCConditions = True
 
 from LArDigitization.LArDigitizationFlags import jobproperties as lar
 lar.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(True)
diff --git a/Tools/Campaigns/share/MC20d.py b/Tools/Campaigns/share/MC20d.py
index ba3b82c7ebde9a3a9bacbbdab5c7b7e530ee1292..9ce673b5a1bc0e6aa0ad165b79ea7670b3eb386d 100644
--- a/Tools/Campaigns/share/MC20d.py
+++ b/Tools/Campaigns/share/MC20d.py
@@ -5,6 +5,7 @@ bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
 
 from Digitization.DigitizationFlags import digitizationFlags
 digitizationFlags.OldBeamSpotZSize = 42
+digitizationFlags.UseUpdatedTGCConditions = True
 
 from AthenaCommon.Resilience import protectedInclude
 protectedInclude('LArConfiguration/LArConfigRun2Old.py')
diff --git a/Tools/Campaigns/share/MC20e.py b/Tools/Campaigns/share/MC20e.py
index ba3b82c7ebde9a3a9bacbbdab5c7b7e530ee1292..9ce673b5a1bc0e6aa0ad165b79ea7670b3eb386d 100644
--- a/Tools/Campaigns/share/MC20e.py
+++ b/Tools/Campaigns/share/MC20e.py
@@ -5,6 +5,7 @@ bf.Beam.numberOfCollisions.set_Value_and_Lock(20.0)
 
 from Digitization.DigitizationFlags import digitizationFlags
 digitizationFlags.OldBeamSpotZSize = 42
+digitizationFlags.UseUpdatedTGCConditions = True
 
 from AthenaCommon.Resilience import protectedInclude
 protectedInclude('LArConfiguration/LArConfigRun2Old.py')