diff --git a/Reconstruction/Jet/JetRec/python/JetRecFlags.py b/Reconstruction/Jet/JetRec/python/JetRecFlags.py
index 9a3a9dbef794e80a321d59d68c00b9f6274e12df..da89cc51b09cbdd21def3c401476421e3366661d 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecFlags.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecFlags.py
@@ -233,15 +233,17 @@ class JetContentDetail:
   Trigger=4
 
 class detailLevel(JobProperty):
-  """ Toggles detail level for AOD jet reconstruction
-      1. Reduced: This will disable the building of jet containers other than:
-        AntiKt4EMTopoJets, AntiKt4EMPFlowJets, AntiKt4LCTopoJets
-      2. Full: This corresponds to the r21 default prior to AOD size reduction:
-        AntiKt10LCTopoJets, AntiKt2PV0TrackJets, AntiKt4PV0TrackJets,
-        AntiKt4TruthJets, AntiKt4TruthWZJets, AntiKt10TruthJets, AntiKt10TruthWZJets
-      3. Validation: This adds to the Full content the building of jet containers:
-        AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets
-        with substructure moments included
+  """ Toggles detail level for AOD jet reconstruction when running with RecExCommon
+      If doWriteESD is set to True, then all built jet collections are written
+      to the AODs otherwise as specified below:
+      1. Reduced: This will build jet containers needed for monitoring:
+        AntiKt4EMTopoJets, AntiKt4EMPFlowJets, AntiKt4LCTopoJets, AntiKt4TruthJets, AntiKt10LCTopoJets
+        If writing to AOD turned on, only R = 0.4 reco jets will be written to disk
+      2. Full: Same building of jet collections as 'Reduced'
+        If writing to AOD turned on, all jet collections will be written to disk
+      3. Validation: Not supported in r22
+      4. Trigger: Same building of jet collections as 'Reduced' + trimmed R = 1.0 LCTopo jets
+        All reco jet collections (R = 0.4, R = 1.0 ungroomed and groomed) are written to disk
   """
   statusOn = True
   allowedTypes = ['int']
diff --git a/Reconstruction/Jet/JetRec/python/JetRecUtils.py b/Reconstruction/Jet/JetRec/python/JetRecUtils.py
index 1cd29ce7aab08a45cfc47095c83edbeefd0c0580..1250a18430f6949e2343cb612c5605a92ee24e44 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecUtils.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecUtils.py
@@ -62,12 +62,9 @@ def retrieveAODList(enableOutputOverride = False):
 
         if rec.doTruth():
             l += [
-                'xAOD::JetContainer#AntiKt10TruthJets',                 'xAOD::JetAuxContainer#AntiKt10TruthJetsAux.',
-                'xAOD::JetContainer#AntiKt10TruthWZJets',               'xAOD::JetAuxContainer#AntiKt10TruthWZJetsAux.',
                 'xAOD::JetContainer#AntiKt4TruthJets',                  'xAOD::JetAuxContainer#AntiKt4TruthJetsAux.',
-                'xAOD::JetContainer#AntiKt4TruthWZJets',                'xAOD::JetAuxContainer#AntiKt4TruthWZJetsAux.',
                 ]
-    elif jetFlags.detailLevel()==JetContentDetail.Trigger or jetFlags.detailLevel()==JetContentDetail.Validation:
+    elif jetFlags.detailLevel()==JetContentDetail.Trigger:
         l += ['xAOD::JetContainer#AntiKt10LCTopoJets',                       'xAOD::JetAuxContainer#AntiKt10LCTopoJetsAux.']
         l += ['xAOD::JetContainer#AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets', 'xAOD::JetAuxContainer#AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsAux.']
 
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecoSteering.py b/Reconstruction/Jet/JetRecConfig/python/JetRecoSteering.py
index 0cf41adcee7b4ceff1c8664655a1c487f2d7d325..7e9050e3e49c604559f8749f15fb3e559cc22a09 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetRecoSteering.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetRecoSteering.py
@@ -29,6 +29,14 @@ def addJetsToOutput(flags,jetdefs, toAOD=True, toESD=True):
         #   auxprefix = "Trig"
         #   jetAODList += [ f"xAOD::Jet{auxprefix}AuxContainer#{jetdef.fullname()}Aux." ,
 
+    # Store event shapes when jets are being stored to output
+    jetList += ["xAOD::EventShape#Kt4EMPFlowEventShape",
+                "xAOD::EventShapeAuxInfo#Kt4EMPFlowEventShapeAux.",
+                "xAOD::EventShape#Kt4EMTopoOriginEventShape",
+                "xAOD::EventShapeAuxInfo#Kt4EMTopoOriginEventShapeAux.",
+                "xAOD::EventShape#Kt4LCTopoOriginEventShape",
+                "xAOD::EventShapeAuxInfo#Kt4LCTopoOriginEventShapeAux."]
+
     from OutputStreamAthenaPool.OutputStreamConfig import addToESD, addToAOD
     if toESD:
         result.merge(addToESD(flags, jetList))
@@ -59,4 +67,4 @@ def JetRecoSteeringCfg(flags):
     if flags.Output.doWriteESD:
         result.merge(addJetsToOutput(flags, jetdefs, toAOD=False, toESD=True))
 
-    return result
\ No newline at end of file
+    return result