diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index 0aa6e075e7e0cfa9df5241cf07756b91aaa62813..56cdad46c1a21392fd700a427e96cf0f5409200a 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -169,7 +169,7 @@ class TrigEgammaMonAlgBuilder:
     
     # This will be removed for future.
     monitoring_electron = ['HLT_e3_etcut_L1EM3','HLT_e5_etcut_L1EM3','HLT_e7_etcut_L1EM3','HLT_e300_etcut_L1EM24VHI']
-    monitoring_photon = ['HLT_g5_etcut_L1EM3','HLT_g5_loose_L1EM3','HLT_g5_medium_L1EM3', 'HLT_g5_tight_L1EM3', 'HLT_g25_etcut_L1EM15VH','HLT_g25_loose_L1EM15VH','HLT_g25_medium_L1EM15VH', 'HLT_g25_tight_L1EM15VH', 'HLT_g140_loose_L1EM24VH']
+    monitoring_photon = ['HLT_g5_etcut_L1EM3','HLT_g5_loose_L1EM3','HLT_g5_medium_L1EM3', 'HLT_g5_tight_L1EM3', 'HLT_g25_etcut_L1EM20VH','HLT_g25_loose_L1EM20VH','HLT_g25_medium_L1EM20VH', 'HLT_g25_tight_L1EM20VH', 'HLT_g140_loose_L1EM24VH']
     monitoringTP_electron = ['HLT_e26_lhtight_L1EM22VHI','HLT_e60_lhmedium_L1EM22VHI','HLT_e140_lhloose_L1EM22VHI']
 
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index 035399a20f7659ab874c8d52c87106072747a95e..83cd81bf4c25ebbff4cbc788fca99ffd2fd2a6e2 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -184,18 +184,21 @@ TrigSignatureMoniMT                                 INFO -- #1776910226 Features
 TrigSignatureMoniMT                                 INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
 TrigSignatureMoniMT                                 INFO -- #2706532790 Events         14         14         14         14         12         12         -          -          -          -          -          -          -          -          12
 TrigSignatureMoniMT                                 INFO -- #2706532790 Features                             24         24         22         20         -          -          -          -          -          -          -          -
-TrigSignatureMoniMT                                 INFO HLT_g25_loose_L1EM15VH #531040386
-TrigSignatureMoniMT                                 INFO -- #531040386 Events          8          8          7          7          7          6          -          -          -          -          -          -          -          -          6
-TrigSignatureMoniMT                                 INFO -- #531040386 Features                              9          9          18         7          -          -          -          -          -          -          -          -
-TrigSignatureMoniMT                                 INFO HLT_g25_medium_L1EM15VH #3776886359
-TrigSignatureMoniMT                                 INFO -- #3776886359 Events         8          8          7          7          7          6          -          -          -          -          -          -          -          -          6
-TrigSignatureMoniMT                                 INFO -- #3776886359 Features                             7          7          13         6          -          -          -          -          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_g25_etcut_L1EM20VH #1417839619
+TrigSignatureMoniMT                                 INFO -- #1417839619 Events         7          7          7          7          7          -          -          -          -          -          -          -          -          -          7
+TrigSignatureMoniMT                                 INFO -- #1417839619 Features                             11         11         10         -          -          -          -          -          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_g25_loose_L1EM20VH #3476696431
+TrigSignatureMoniMT                                 INFO -- #3476696431 Events         7          7          7          7          7          6          -          -          -          -          -          -          -          -          6
+TrigSignatureMoniMT                                 INFO -- #3476696431 Features                             9          9          18         7          -          -          -          -          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_g25_medium_L1EM20VH #1519793981
+TrigSignatureMoniMT                                 INFO -- #1519793981 Events         7          7          7          7          7          6          -          -          -          -          -          -          -          -          6
+TrigSignatureMoniMT                                 INFO -- #1519793981 Features                             7          7          13         6          -          -          -          -          -          -          -          -
 TrigSignatureMoniMT                                 INFO HLT_g25_medium_mu24_ivarmedium_L1MU20 #1007052793
 TrigSignatureMoniMT                                 INFO -- #1007052793 Events         8          8          2          2          2          2          2          1          1          1          0          -          -          -          0
 TrigSignatureMoniMT                                 INFO -- #1007052793 Features                             2          2          4          2          2          1          1          1          0          -          -          -
-TrigSignatureMoniMT                                 INFO HLT_g25_tight_L1EM15VH #3691147775
-TrigSignatureMoniMT                                 INFO -- #3691147775 Events         8          8          7          7          7          5          -          -          -          -          -          -          -          -          5
-TrigSignatureMoniMT                                 INFO -- #3691147775 Features                             7          7          13         5          -          -          -          -          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_g25_tight_L1EM20VH #3370790749
+TrigSignatureMoniMT                                 INFO -- #3370790749 Events         7          7          7          7          7          5          -          -          -          -          -          -          -          -          5
+TrigSignatureMoniMT                                 INFO -- #3370790749 Features                             7          7          13         5          -          -          -          -          -          -          -          -
 TrigSignatureMoniMT                                 INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
 TrigSignatureMoniMT                                 INFO -- #1158879722 Events         2          2          0          0          0          0          -          -          -          -          -          -          -          -          0
 TrigSignatureMoniMT                                 INFO -- #1158879722 Features                             0          0          0          0          -          -          -          -          -          -          -          -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 89311491c54e16b188d4181c4ce136ed6192fd86..c6886a296628c04c508b18e026f182a01c6d930a 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -184,18 +184,21 @@ TrigSignatureMoniMT                                 INFO -- #1776910226 Features
 TrigSignatureMoniMT                                 INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
 TrigSignatureMoniMT                                 INFO -- #2706532790 Events         20         20         4          4          3          3          -          -          -          -          -          -          -          -          3          
 TrigSignatureMoniMT                                 INFO -- #2706532790 Features                             5          5          4          4          -          -          -          -          -          -          -          -          
-TrigSignatureMoniMT                                 INFO HLT_g25_loose_L1EM15VH #531040386
-TrigSignatureMoniMT                                 INFO -- #531040386 Events          20         20         2          2          2          0          -          -          -          -          -          -          -          -          0          
-TrigSignatureMoniMT                                 INFO -- #531040386 Features                              2          2          6          0          -          -          -          -          -          -          -          -          
-TrigSignatureMoniMT                                 INFO HLT_g25_medium_L1EM15VH #3776886359
-TrigSignatureMoniMT                                 INFO -- #3776886359 Events         20         20         0          0          0          0          -          -          -          -          -          -          -          -          0          
-TrigSignatureMoniMT                                 INFO -- #3776886359 Features                             0          0          0          0          -          -          -          -          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_g25_etcut_L1EM20VH #1417839619
+TrigSignatureMoniMT                                 INFO -- #1417839619 Events         20         20         3          3          2          -          -          -          -          -          -          -          -          -          2          
+TrigSignatureMoniMT                                 INFO -- #1417839619 Features                             3          3          2          -          -          -          -          -          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_g25_loose_L1EM20VH #3476696431
+TrigSignatureMoniMT                                 INFO -- #3476696431 Events         20         20         2          2          2          0          -          -          -          -          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #3476696431 Features                             2          2          6          0          -          -          -          -          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_g25_medium_L1EM20VH #1519793981
+TrigSignatureMoniMT                                 INFO -- #1519793981 Events         20         20         0          0          0          0          -          -          -          -          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #1519793981 Features                             0          0          0          0          -          -          -          -          -          -          -          -          
 TrigSignatureMoniMT                                 INFO HLT_g25_medium_mu24_ivarmedium_L1MU20 #1007052793
 TrigSignatureMoniMT                                 INFO -- #1007052793 Events         20         20         0          0          0          0          0          0          0          0          0          -          -          -          0          
 TrigSignatureMoniMT                                 INFO -- #1007052793 Features                             0          0          0          0          0          0          0          0          0          -          -          -          
-TrigSignatureMoniMT                                 INFO HLT_g25_tight_L1EM15VH #3691147775
-TrigSignatureMoniMT                                 INFO -- #3691147775 Events         20         20         0          0          0          0          -          -          -          -          -          -          -          -          0          
-TrigSignatureMoniMT                                 INFO -- #3691147775 Features                             0          0          0          0          -          -          -          -          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_g25_tight_L1EM20VH #3370790749
+TrigSignatureMoniMT                                 INFO -- #3370790749 Events         20         20         0          0          0          0          -          -          -          -          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #3370790749 Features                             0          0          0          0          -          -          -          -          -          -          -          -          
 TrigSignatureMoniMT                                 INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
 TrigSignatureMoniMT                                 INFO -- #1158879722 Events         20         20         0          0          0          0          -          -          -          -          -          -          -          -          0          
 TrigSignatureMoniMT                                 INFO -- #1158879722 Features                             0          0          0          0          -          -          -          -          -          -          -          -          
@@ -525,7 +528,7 @@ TrigSignatureMoniMT                                 INFO -- #166231461 Events
 TrigSignatureMoniMT                                 INFO -- #166231461 Features                              -          -          -          -          -          -          -          -          -          -          -          -          
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1MBTS_1_EMPTY #4174355886
 TrigSignatureMoniMT                                 INFO -- #4174355886 Events         20         20         -          -          -          -          -          -          -          -          -          -          -          -          20         
-TrigSignatureMoniMT                                 INFO -- #4174355886 Features                             -          -          -          -          -          -          -          -          -          -          -          -
+TrigSignatureMoniMT                                 INFO -- #4174355886 Features                             -          -          -          -          -          -          -          -          -          -          -          -          
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1RD0_EMPTY #914660695
 TrigSignatureMoniMT                                 INFO -- #914660695 Events          20         20         -          -          -          -          -          -          -          -          -          -          -          -          20         
 TrigSignatureMoniMT                                 INFO -- #914660695 Features                              -          -          -          -          -          -          -          -          -          -          -          -          
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 4ead191b055e92ac11300a65ab7e61a09b57a49f..8de2f30c342237c8adfeafdbca9ae64d60cbdb69 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -108,7 +108,6 @@ def setupMenu():
         ChainProp(name='HLT_e5_lhmedium_noringer_L1EM3', groups=SingleElectronGroup),
         ChainProp(name='HLT_e5_lhtight_noringer_L1EM3', groups=SingleElectronGroup),
         ChainProp(name='HLT_e5_lhtight_noringer_nod0_L1EM3', groups=SingleElectronGroup),
-        ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiPhotonGroup),    
 
         # low et threshold chains using Ringer
         ChainProp(name='HLT_e5_lhloose_L1EM3', groups=SingleElectronGroup),
@@ -130,6 +129,8 @@ def setupMenu():
         ChainProp(name='HLT_2e17_lhvloose_L12EM15VH', stream=[PhysicsStream], groups=MultiElectronGroup),
         ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VH', stream=[PhysicsStream], groups=SingleElectronGroup),
 
+        # TnP triggers
+        ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup),    
         # for moving to PhysicsP1, ATR-21242
         # ChainProp(name='HLT_2e17_etcut_L12EM15VHI', stream=[PhysicsStream], groups=MultiElectronGroup),
 
@@ -139,9 +140,10 @@ def setupMenu():
         ChainProp(name='HLT_g5_loose_L1EM3', groups=SinglePhotonGroup),
         ChainProp(name='HLT_g5_medium_L1EM3', groups=SinglePhotonGroup),
         ChainProp(name='HLT_g5_tight_L1EM3', groups=SinglePhotonGroup),
-        ChainProp(name='HLT_g25_loose_L1EM15VH', groups=SinglePhotonGroup),
-        ChainProp(name='HLT_g25_medium_L1EM15VH', groups=SinglePhotonGroup),
-        ChainProp(name='HLT_g25_tight_L1EM15VH', groups=SinglePhotonGroup),
+        ChainProp(name='HLT_g25_etcut_L1EM20VH', groups=SinglePhotonGroup),
+        ChainProp(name='HLT_g25_loose_L1EM20VH', groups=SinglePhotonGroup),
+        ChainProp(name='HLT_g25_medium_L1EM20VH', groups=SinglePhotonGroup),
+        ChainProp(name='HLT_g25_tight_L1EM20VH', groups=SinglePhotonGroup),
         # Primary photon chains
         ChainProp(name='HLT_g140_loose_L1EM22VHI', groups=SinglePhotonGroup),
         ChainProp(name='HLT_2g35_medium_L12EM20VH', groups=MultiPhotonGroup),