diff --git a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h
index ccca4d2466f642c2cbbb6135298912de90ecb372..2743222d96c941b9a1f1b0fb54c65849c52f41d4 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h
@@ -34,7 +34,8 @@ auto charAccessors = initAccessors<char>(
   "muonCaloTag", "tagFakeTrack", "tagIsoTrack", "tagMuonTrack",
   "vsi_isFake", "vsi_isPassMMV", "vsi_trkd0cut", "vsi_twoCircErrcut", "vsi_twoCircRcut", "vsi_fastErrcut", "vsi_fastRcut", "vsi_fitErrcut", "vsi_chi2cut",
   "overflow",
-  "GNTau_VeryLoose", "GNTau_Loose", "GNTau_Medium", "GNTau_Tight"
+  "GNTau_VeryLoose", "GNTau_Loose", "GNTau_Medium", "GNTau_Tight",
+  "NNJvtPass"
   );
 
 auto intAccessors = initAccessors<int>(
@@ -72,7 +73,7 @@ auto uint64Accessors = initAccessors<uint64_t>("start", "stop", "thresholdPatter
 auto sizeAccessors = initAccessors<size_t>("alg_idx");
 
 auto floatAccessors = initAccessors<float>(
-  "EBWeight", "Jvt", "JvtRpt", "IP2D_bc", "IP2D_bu", "IP2D_cu", "IP3D_bc", "IP3D_bu", "IP3D_cu",
+  "EBWeight", "Jvt", "JvtRpt", "NNJvt", "IP2D_bc", "IP2D_bu", "IP2D_cu", "IP3D_bc", "IP3D_bu", "IP3D_cu",
   "ActiveArea", "ActiveArea4vec_eta", "ActiveArea4vec_m", "ActiveArea4vec_phi", "ActiveArea4vec_pt",
   "JetEtaJESScaleMomentum_eta", "JetEtaJESScaleMomentum_m", "JetEtaJESScaleMomentum_phi", "JetEtaJESScaleMomentum_pt",
   "JetGSCScaleMomentum_eta", "JetGSCScaleMomentum_m", "JetGSCScaleMomentum_phi", "JetGSCScaleMomentum_pt",
@@ -195,7 +196,7 @@ auto doubleAccessors = initAccessors<double>("ptcone02", "ptcone03", "JetDensity
 auto vboolAccessors = initAccessors<std::vector<bool>>("IP2D_flagFromV0ofTracks", "IP3D_flagFromV0ofTracks");
 
 auto vintAccessors = initAccessors<std::vector<int>>(
-  "counts", "IP2D_gradeOfTracks", "IP3D_gradeOfTracks", "NumTrkPt1000", "NumTrkPt500");
+  "counts", "IP2D_gradeOfTracks", "IP3D_gradeOfTracks", "NumTrkPt1000", "NumTrkPt500", "DNumTrkPt1000", "SumPtTrkOrderedNumTrkPt1000");
 
 auto vushortAccessors = initAccessors<std::vector<unsigned short>>("robs_status");
 
@@ -212,7 +213,8 @@ auto vfloatAccessors = initAccessors<std::vector<float>>(
   "JetFitter_fittedCov", "JetFitter_fittedPosition", "JetFitter_tracksAtPVchi2", "JetFitter_tracksAtPVndf",
   "EnergyPerSampling", "EnergyPerSamplingCaloBased", "SumPtChargedPFOPt500", "SumPtTrkPt1000", "SumPtTrkPt500", "TrackWidthPt1000",
   "pTcuts", "z0cuts", "vertexZcuts", "btagIp_trackMomentum", "btagIp_trackDisplacement",
-  "vsi_vrtFast_trkd0", "vsi_vrtFast_trkz0", "parameterPX", "parameterPY", "parameterPZ");
+  "vsi_vrtFast_trkd0", "vsi_vrtFast_trkz0", "parameterPX", "parameterPY", "parameterPZ",
+  "RPtTrkPt500", "DTrackWidthPt1000", "DRPtTrkPt500", "SumPtTrkOrderedTrackWidthPt1000");
 
 auto elroiAccessors = initAccessors<ElementLink<TrigRoiDescriptorCollection>>("viewIndex");
 
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 120bd5a8cb48d082529b4a0415ebba283e5031e3..ecb92f4ddc696958df6eb6d328fbef05b2a9b902 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # ------------------------------------------------------------
 # Definition of trigger EDM for Run 3
@@ -47,6 +47,8 @@ JetCopyVarsToKeep = ['pt', 'eta', 'phi', 'm',
                      # additional variables also stored in TLA stream for jet cleaning studies
                      # stored for calibrated HLT container in the same way as in the TLA streams
                      "N90Constituents", "LArQuality", "FracSamplingMax", "NegativeE", "HECQuality", "AverageLArQF", "BchCorrCell",
+                     # NN JVT -- TrkAug version
+                     'NNJvt','NNJvtPass', 'RPtTrkPt500', 'DTrackWidthPt1000', 'DNumTrkPt1000', 'DRPtTrkPt500', 'SumPtTrkOrderedTrackWidthPt1000', 'SumPtTrkOrderedNumTrkPt1000',
                     ]
 
 FastFtagPFlowVarsToKeep = [f'dips20211116_p{x}' for x in 'cub']
@@ -90,6 +92,7 @@ TLAJetVarsToKeep = [
                    'JetEtaJESScaleMomentum_eta', 'JetEtaJESScaleMomentum_m', 'JetEtaJESScaleMomentum_phi', 'JetEtaJESScaleMomentum_pt',
                    'JetGSCScaleMomentum_eta', 'JetGSCScaleMomentum_m', 'JetGSCScaleMomentum_phi', 'JetGSCScaleMomentum_pt',
                    'Jvt', 'JVFCorr', 'JvtRpt',
+                   'NNJvt','NNJvtPass',
                    'SumPtChargedPFOPt500', 'NumTrkPt1000', 'SumPtTrkPt500', 'TrackWidthPt1000', 'N90Constituents',
                    'LArQuality','FracSamplingMax',  'NegativeE', 'Timing', 'HECQuality','AverageLArQF', 'BchCorrCell',
                    ]
@@ -242,6 +245,9 @@ varToRemoveFromAODSLIM = [
     ('GhostTrack_ftf', 'HLT_AntiKt4EMTopoJets_nojcalib_ftfAux', 'HLT_AntiKt4EMPFlowJets_nojcalib_ftfAux', 'HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAux'),
     ('TracksForMinimalJetTag', 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAux'),
     ]
+# Detailed NNJvt input variables
+for var in ['RPtTrkPt500', 'DTrackWidthPt1000', 'DNumTrkPt1000', 'DRPtTrkPt500', 'SumPtTrkOrderedTrackWidthPt1000', 'SumPtTrkOrderedNumTrkPt1000']:
+    varToRemoveFromAODSLIM.append((var, 'HLT_AntiKt4EMPFlowJets_subresgscIS_ftfAux', ''))