diff --git a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
index 50fb6df92843e23b680c16348ae60fd433b02e2a..1d19deec439645c6289d7682e9cd37a42844f3b7 100644
--- a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
+++ b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
@@ -218,11 +218,12 @@ test 30
 
 
 # todo: get automatically what is currently running from ami
+# conditionsTag and geometryVersion need to be updated from time to time
 test 41
   name Trigreco_physicsV7_currentT0
   doc Trig_reco_tf with current T0 config
   checklog --config checklogTrigP1Test.conf --showexcludestats
-  athena_cmd Trig_reco_tf.py --inputBS_RDOFile "root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/data15_13TeV.00272531.physics_Main.daq.RAW._lb0104._SFO-5._0001.data" --precommand "testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS" ; source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile "tmp.BS" --athenaopts=" --perfmon "  --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --outputNTUP_MUONCALIBFile 'myNTUP_MUONCALIB.root' --autoConfiguration='everything' --preExec 'all:from MuonRecExample.MuonRecFlags import muonRecFlags;muonRecFlags.useLooseErrorTuning.set_Value_and_Lock(True);DQMonFlags.doCTPMon=False;' --triggerConfig r2e=DATARECO:REPR
+  athena_cmd Trig_reco_tf.py --inputBS_RDOFile "root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/data15_13TeV.00272531.physics_Main.daq.RAW._lb0104._SFO-5._0001.data" --precommand "testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS" ; source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile "tmp.BS" --athenaopts=" --perfmon "  --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --outputNTUP_MUONCALIBFile 'myNTUP_MUONCALIB.root' --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --triggerConfig r2e=DATARECO:REPR
   post_command checkFile.py myAOD.pool.root > AOD.txt 
 
 
@@ -465,13 +466,14 @@ test 73
 
 #############################################################################################
 ## Transform tests on BS from main  HLT_physicsV7 test
+## conditionsTag and geometryVersion need to be updated from time to time
 #############################################################################################    
 test 80
   name RAWtoESD_physicsV7
   doc RAWtoESD on output from HLT_physicsV7
   checklog --config checklogTrigP1Test.conf --showexcludestats
   pre_condition test -e '../HLT_physicsV7/HLT_physicsV7._0001.data'
-  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py  --preExec 'from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArHVCorr=False;jobproperties.CaloCellFlags.doPileupOffsetBCIDCorr.set_Value_and_Lock(False);from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.doInnerDetectorCommissioning.set_Value_and_Lock(True);InDetFlags.useBroadClusterErrors.set_Value_and_Lock(False);DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;from JetRec.JetRecFlags import jetFlags;jetFlags.useTracks=False;DQMonFlags.doLVL1CaloMon=False;DQMonFlags.doCTPMon=False;' --autoConfiguration 'everything'  --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data   --maxEvents 5 --outputESDFile RAWtoESD.pool.root 
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py  --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True);' --autoConfiguration 'everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01"  --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data   --maxEvents 5 --outputESDFile RAWtoESD.pool.root
   post_command checkFile.py RAWtoESD.pool.root > ESD.txt
 
 test 81