diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
index 1d7790241be2f5e5d5770b9fca0c97fc305ba271..03ae26c664ddb27ffad6fa7d6dd178640d46c545 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
@@ -39,7 +39,7 @@ Reco_tf.py \
     --geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
     --digiSeedOffset1="8" \
     --digiSeedOffset2="8" \
-    --CA "default:True" "RDOtoRDOTrigger:False" \
+    --CA "default:True" \
     --steering "doRDO_TRIG" "doTRIGtoALL" \
     --outputDAOD_IDTIDEFile="DAOD_TIDE.pool.root"  \
     --outputRDOFile output.RDO.root \
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh
index 86f402b1d479d7df7a0e0ea9cbe3b174791fd697..f9db7dc2f5bd84d8487eea709ccdf636bfe86887 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh
@@ -51,7 +51,7 @@ cd 1thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q442 \
            --preExec "all:flags.DQ.Steering.doHLTMon=False" \
            --imf False \
@@ -73,7 +73,7 @@ cd 5thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q442 \
            --preExec "all:flags.DQ.Steering.doHLTMon=False" \
            --imf False \
@@ -95,7 +95,7 @@ cd 8thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q442 \
            --preExec "all:flags.DQ.Steering.doHLTMon=False" \
            --imf False \
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh
index 7728d3ffe467b3c600669106ef483cd4de36db6d..f33a493b98d9686ef08e28872d9f08806572d4b6 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh
@@ -34,7 +34,7 @@ mkdir Serial
 cd Serial
 
 #####################################################################
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --postInclude "RAWtoALL:MuonPRDTest.NSWPRDValAlgReco.NSWPRDValAlgRecoCfg" \
@@ -60,7 +60,7 @@ cd 1thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --multithreaded \
@@ -85,7 +85,7 @@ cd 5thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --imf False \
@@ -110,7 +110,7 @@ cd 8thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --imf False \
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh
index bb680774e906320bad5d6818c22d7c7df5ef4d05..f0cf66da2e1439161903b02caf738b4348bc3a9b 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh
@@ -14,7 +14,7 @@ ATHENA_CORE_NUMBER=4 Reco_tf.py \
 --multithreaded \
 --AMIConfig q445 \
 --imf False \
---CA all:True RDOtoRDOTrigger:False \
+--CA all:True \
 --preExec="all:flags.BTagging.Trackless=True" \
 --maxEvents 25
 
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh
index 66e0f8080956ddf95a3b1f65c198b5ceb57f4008..e74134a30d37f06641ba87fe4e16d0e5ccea5777 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh
@@ -14,7 +14,7 @@ ATHENA_CORE_NUMBER=4 Reco_tf.py \
 --multithreaded \
 --AMIConfig q449 \
 --imf False \
---CA all:True RDOtoRDOTrigger:False \
+--CA all:True \
 --preExec="all:flags.BTagging.Trackless=True" \
 --maxEvents 25
 
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
index 7f68be7f4a6eadc153acd608a8161064db22f23b..3b49428e1539ef60a52838a4fb7b2fbf54ad883f 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
@@ -25,7 +25,7 @@ rdo2aod.max_events = 800
 rdo2aod.threads = 4
 rdo2aod.concurrent_events = 4
 rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG"'
-rdo2aod.args += ' --CA "default:True" "RDOtoRDOTrigger:False"'
+rdo2aod.args += ' --CA "default:True"'
 rdo2aod.args += ' --preExec="all:{:s};"'.format(preExec)
 
 
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet.sh b/Reconstruction/Jet/JetValidation/test/test_jet.sh
index 942a00fec9f3cd198c9f26d85358f8bbd168f5bb..bf88a57d61af69eb35372a6be4d2ff52c60060a8 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet.sh
@@ -11,7 +11,7 @@
 export ATHENA_CORE_NUMBER=8
 Reco_tf.py \
   --AMI q443 \
-  --CA "all:True" "RDOtoRDOTrigger:False" \
+  --CA "all:True" \
   --sharedWriter True \
   --steering 'doRDO_TRIG' 'doTRIGtoALL' \
   --outputAODFile myAOD.pool.root \
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
index 657385aecef7c3569f8a8a2699866245d58dc451..e58730fe91b764a5d34c2dbe04d83e3ce0ef69bb 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
@@ -11,7 +11,7 @@
 export ATHENA_CORE_NUMBER=8
 Reco_tf.py \
   --AMI q443 \
-  --CA "all:True" "RDOtoRDOTrigger:False" \
+  --CA "all:True" \
   --sharedWriter True \
   --steering 'doRDO_TRIG' 'doTRIGtoALL' \
   --outputAODFile myAOD.pool.root \
diff --git a/Reconstruction/Jet/JetValidation/test/test_met.sh b/Reconstruction/Jet/JetValidation/test/test_met.sh
index 825e62e3a6f103adb613d74a98678fffb4c85f27..3bde295746dc0a03d4c82921c12787f98b5a3ec8 100755
--- a/Reconstruction/Jet/JetValidation/test/test_met.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_met.sh
@@ -11,7 +11,7 @@
 export ATHENA_CORE_NUMBER=8
 Reco_tf.py \
   --AMI q443 \
-  --CA "all:True" "RDOtoRDOTrigger:False" \
+  --CA "all:True" \
   --sharedWriter True \
   --steering 'doRDO_TRIG' 'doTRIGtoALL' \
   --outputAODFile myAOD.pool.root \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
index bcc4090fdf8176cce4ff5d2bfcfdf96d4bb4e8ca..36cbdf5777d9870fef121bc0dcd8e585e7f20375 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
@@ -9,7 +9,7 @@
 export ATHENA_CORE_NUMBER=8
 
 Reco_tf.py \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
 --multithreaded \
 --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc21_13p6TeV/HITSFiles/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8453_s3873/HITS.29625927._000632.pool.root.1 \
 --steering 'doRDO_TRIG' \
diff --git a/Tools/Tier0ChainTests/test/test_q443.sh b/Tools/Tier0ChainTests/test/test_q443.sh
index b11887d1bf4b13aa66625e5b1d24520c2e461428..ff2c6fdd537fbcc59f288b2ed12edb89c4b2fb88 100755
--- a/Tools/Tier0ChainTests/test/test_q443.sh
+++ b/Tools/Tier0ChainTests/test/test_q443.sh
@@ -11,7 +11,7 @@
 
 Reco_tf.py \
 --AMI=q443 \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
 --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
 --multithreaded \
 --maxEvents=500 \
diff --git a/Tools/Tier0ChainTests/test/test_q443_serial.sh b/Tools/Tier0ChainTests/test/test_q443_serial.sh
index 5bdccf03b5abf5be1d02711167ffdd9a55a596d6..1f5d7adea5619219479c161bda61024128c84e0d 100755
--- a/Tools/Tier0ChainTests/test/test_q443_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_q443_serial.sh
@@ -9,7 +9,7 @@
 # art-include: 24.0/Athena
 
 Reco_tf.py \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
 --AMI=q443 \
 --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
 --maxEvents=100 \
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
index 18fadde9665db7e2e674dccf055f145fb878860f..85ef83f8d3a3a7621a576a7e7ad17708e5de7e85 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
@@ -9,7 +9,7 @@
 # art-html: dcube_physlite
 
 export ATHENA_CORE_NUMBER=8
-Reco_tf.py --CA "all:True" "RDOtoRDOTrigger:False" \
+Reco_tf.py --CA "all:True" \
   --AMI q443 \
   --steering doRDO_TRIG doTRIGtoALL \
   --outputAODFile myAOD.pool.root \
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index 095bdd9b58df70d86a34e171263d613b098a9804..d598be75468c9a3f13b0506db5673723354ef4ad 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -64,7 +64,7 @@ class TrigInDetReco(ExecStep):
         self.args = '--outputAODFile=AOD.pool.root --steering "doRDO_TRIG"'
         self.args += ' --CA'
         if not self._isCA:
-            self.args += ' "default:True" "RDOtoRDOTrigger:False"'
+            self.args += ' "default:True"'
 
        
         if ( self.postinclude_trig != '' ) :