diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
index d242245182e03464abb127b0c933a52e3fc5e824..681b615e046149871a8c4f42b22694cebce6e606 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
@@ -294,7 +294,7 @@ def PHYSVALCfg(flags):
 
     # Full trigger content (needed for T0-style monitoring)
     from DerivationFrameworkTrigger.TrigSlimmingHelper import addTrigEDMSetToOutput
-    addTrigEDMSetToOutput(flags, PHYSVALSlimmingHelper, "AODFULL")
+    addTrigEDMSetToOutput(flags, PHYSVALSlimmingHelper, "ESD")
 
     # Output stream
     PHYSVALItemList = PHYSVALSlimmingHelper.GetItemList()
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/python/TrigSlimmingHelper.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/python/TrigSlimmingHelper.py
index d6210a8c25fdbb1509540361569016cdb78362a6..57826fb3035012ddc933ea5aeccc20646d369c68 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/python/TrigSlimmingHelper.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/python/TrigSlimmingHelper.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 """Helper functions for adding trigger EDM content to a derivation"""
 
@@ -19,10 +19,11 @@ def addTrigEDMSetToOutput(flags, helper: SlimmingHelper, edmSet: str, edmVersion
     edmList = getTriggerEDMList(flags, key=edmSet, runVersion=edmVersion)
     # This list is a mapping from container type to a list of required container names
     # This includes the Aux containers and their lists of aux variables.
-    # The SlimmingHelper however requires the list of *interface* (non-Aux) containers with
-    # the dynamic aux variables specified
+    # The SlimmingHelper however requires the list of *interface* (non-Aux) containers.
+    # At this point we want all xAOD EDM members and all decorations which have propagated
+    # to the AOD to propagate down to the DAOD as well, so we fill the containers into AllVariables.
+    # We additionally pick up non-xAOD items in StaticContent
     # Collate that information here
-    interface_containers = []
     for cont_type, cont_list in edmList.items():
         for container in cont_list:
             # For the next part we need to know all the container names and the associated aux items
@@ -30,8 +31,7 @@ def addTrigEDMSetToOutput(flags, helper: SlimmingHelper, edmSet: str, edmVersion
             # probably safe) then we just need to look at the aux names for this.
             interface_name, aux, auxitems = container.partition("Aux.")
             if aux:
-                # If the string doesn't contain 'Aux.' then aux will be the empty string
-                # i.e. we only enter this block if we're really looking at an aux container
-                interface_containers.append(f"{interface_name}.{auxitems}")
+                helper.AllVariables += [interface_name]
 
-    helper.ExtraVariables += interface_containers
+            if "xAOD::" not in cont_type:
+                helper.StaticContent += [f"{cont_type}#{container}"]
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun4.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun4.py
index 6844809fe1a1a501c55ec2d03a32d4515f021ed8..47f7e760d446e880b3b906113794b98c8823616d 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun4.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun4.py
@@ -36,11 +36,9 @@ TriggerHLTListRun4 = [
     ('xAOD::TrigEMClusterContainer#CaloClustersGlobal',  'BS ESD AODFULL', 'Calo'), 
     ('xAOD::TrigEMClusterAuxContainer#CaloClustersGlobalAux.',  'BS ESD AODFULL', 'Calo'),
 
-    ('CaloCellContainer#SeedLessFS',  'BS ESD AODFULL', 'Calo'), 
+    ('CaloCellContainer#SeedLessFS',  'ESD AODFULL', 'Calo'), 
 
-    # L1 Calo inputs, note we are giving these extended EDM targets
+    # L1 Calo inputs, note we are giving extended EDM targets
     ("CaloCellContainer#SCell",                                'ESD AODFULL', 'L1'),
-    ("TileContainer#TileTTL1Container",                        'ESD AODFULL', 'L1'),
-
 
 ]