diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh
index 9cbe1f48adef3fcc98c8eb9777048019263626df..94e138509fdc787ebc1e3697453feab801969959 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh
@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI f1287  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00420624.express_express.merge.RAW._lb1054._SFO-ALL._0001.1" \
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
index 8a1a7a47f669af9daf03172a8813c2370587b114..2180c80977293c9bee44cb579397f1c2fa4b6bbb 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI f1287  \
 --preExec="all:from RecExConfig.RecFlags import rec; rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig='DB'; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
index 43f5bc9138d7e9ac17a23217d2675a969f5c6d33..5c09a25fd171636e5eb2270f8a7d6aaa878021b5 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI f1287  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00421739.express_express.merge.RAW._lb0534._SFO-12._0001.1" \
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh
index 5ac14e3f1c6af5829a5cd91e3d6fb9dae88ecd88..fe45e24061e3f61cb87a6fb8f2b2e5ed4b86e2a3 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh
@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh
index 2c8a3260c626c2cf0cf3e90cb035a990973c35e6..48f6fc8956e045564637be91b8645ec069b26287 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh
@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_900GeV.00405514.express_express.merge.RAW._lb0123._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh
index 21a8e9081316eae2203cf82d0fe0369ca1d5ea42..cb3403c548f7a2f7ff752d2d75268072887b2c55 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh
@@ -13,7 +13,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=200 \
---preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh
index 2963ec5ea3b16a5be756719cb9a938f744714d2a..2887e691725f5f5dfca56e58186df07a80280cbe 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh
@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI x701  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00421734.express_express.merge.RAW._lb0021._SFO-ALL._0001.1" \
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh
index 61cb791be68dc3719629f3b888a28fbdb40b7932..bc82a1049ce3f3312c8533687dcc8568568bc5a5 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh
@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI x701  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00421739.express_express.merge.RAW._lb0534._SFO-12._0001.1" \
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh
index db870a4299e9da00d266ac23460c698556f1e4ea..f9ae15a46ec6c612e9e7668c6512568ae353a2c7 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh
@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh
index 8a4f31942bf1039daba6adff58c9863bcfe49d66..617a36d9323553dceb6aa3a480ace0b263c64c96 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh
@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_900GeV.00405514.express_express.merge.RAW._lb0123._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh
index c957c2bf108d35aaca484401c1152411e5dfb737..204fd02020b4366338b575cb46d9580b949315b2 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh
@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=200 \
---preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \