diff --git a/FTagDumper/grid/inputs/GN3_dev.txt b/FTagDumper/grid/inputs/GN3_dev.txt
index 813e0e2f0968e55f309993b49d4ec235673fe2c3..3108e07a887203cc0e9e4de043bfc91e6775f18d 100644
--- a/FTagDumper/grid/inputs/GN3_dev.txt
+++ b/FTagDumper/grid/inputs/GN3_dev.txt
@@ -1,24 +1,31 @@
 # Single b-tag training samples for GN3
-# https://ftag.docs.cern.ch/software/samples/
+# https://ftag.docs.cern.ch/algorithms/samples/
 # For these trainings we will avoid the standard ttbar
 # so that we don't have to k-fold the model.
 
 # -------------------------------------------------------------------------------------------------
-# Dedicated ttbar training samples: mc20d, mc23a and mc23c (https://its.cern.ch/jira/browse/ATLFTAGDPD-395)
+# Dedicated (Blacklisted) ttbar training samples: MC20d, MC23a and MC23d (https://its.cern.ch/jira/browse/ATLFTAGDPD-439)
 # -------------------------------------------------------------------------------------------------
-mc20_13TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8547_s3797_r13144_p6368
-mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4159_r14799_p6368
-mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4162_r14622_p6368
+mc20_13TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8547_s3797_r13144_p6698
+mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4162_r14622_p6698
+mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4159_r15530_p6698
 
 # ------------------------------------
-# Default run 3 training samples: mc23a
+# Z' extended training samples: MC20d, MC23a, and MC23d
 # ------------------------------------
-# Z' extended
-mc23_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8514_s4162_r14622_p6368
+mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3681_r13144_p6698
+mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3797_r13144_p6698
+mc23_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8514_s4162_r14622_p6698
+mc23_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8514_s4159_r15530_p6698
 
-# -------------------------------------
-# Default run 2 training samples: mc20d
-# -------------------------------------
-# Z' extended
-mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3797_r13144_p6368
-mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3681_r13144_p6368
+# ------------------------------------
+# gamma* to tau_had tau_had training samples: MC23a and MC23d
+# ------------------------------------
+mc23_13p6TeV.801002.Py8EG_A14NNPDF23LO_Gammatautau_MassWeight.deriv.DAOD_FTAG1.e8514_s4162_r14622_p6698
+mc23_13p6TeV.801002.Py8EG_A14NNPDF23LO_Gammatautau_MassWeight.deriv.DAOD_FTAG1.e8514_s4159_r15530_p6698
+
+# ------------------------------------
+# Standard (not for training) ttbar sample for comparisons: MC20d, MC20e
+# ------------------------------------
+mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_FTAG1.e6337_s3681_r13144_p6698
+mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_FTAG1.e6337_s3681_r13145_p6698
diff --git a/FTagDumper/grid/inputs/single-btag.txt b/FTagDumper/grid/inputs/single-btag.txt
index d5a200420845b65313fce71282d258e7bb00d007..d54cef1ed41360ae7f3b61d8c9f4971713ea80e9 100644
--- a/FTagDumper/grid/inputs/single-btag.txt
+++ b/FTagDumper/grid/inputs/single-btag.txt
@@ -1,74 +1,17 @@
 # Single b-tag training samples
-# https://ftag.docs.cern.ch/software/samples/
+# https://ftag.docs.cern.ch/algorithms/samples/
 
 # -------------------------------------------------------------------------------------------------
-# New training samples: mc20d, mc23a and mc23c (https://its.cern.ch/jira/browse/ATLFTAGDPD-395)
+# Dedicated (Blacklisted) ttbar training samples: MC20d, MC23a and MC23c (https://its.cern.ch/jira/browse/ATLFTAGDPD-439)
 # -------------------------------------------------------------------------------------------------
-mc20_13TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8547_s3797_r13144_p6368
-mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4159_r14799_p6368
-mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4162_r14622_p6368
+mc20_13TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8547_s3797_r13144_p6698
+mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4162_r14622_p6698
+mc23_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8549_s4159_r15530_p6698
 
 # ------------------------------------
-# Default run 3 training samples: mc23a
+# Z' extended training samples: MC20d, MC23a, and MC23d
 # ------------------------------------
-# ttbar
-mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_FTAG1.e8514_s4162_r15687_p6368
-mc23_13p6TeV.601230.PhPy8EG_A14_ttbar_hdamp258p75_dil.deriv.DAOD_FTAG1.e8514_s4159_r15530_p6368
-
-# Z' extended
-mc23_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8514_s4162_r14622_p6368
-
-# ------------------------------
-# mc21 run 3 training samples
-# ------------------------------
-# ttbar
-#mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_FTAG1.e8453_s3873_r13829_p5627
-#mc21_13p6TeV.601230.PhPy8EG_A14_ttbar_hdamp258p75_dil.deriv.DAOD_FTAG1.e8453_s3873_r13829_p5627
-#mc21_13p6TeV.601589.PhPy8EG_A14_ttbar_hdamp258p75_nonallhadron.deriv.DAOD_FTAG1.e8485_s3873_r13829_p5627
-
-# Z' extended
-#mc21_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8464_s3873_r13829_p5627
-
-# Z' extended radiatation damage off
-#mc21_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8464_s3873_r14193_p5627	
-
-
-# -------------------------------------
-# Default run 2 training samples: mc20d
-# -------------------------------------
-# ttbar and Z' extended
-mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_FTAG1.e6337_s3681_r13144_p6368
-mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3797_r13144_p6368
-mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3681_r13144_p6368
-
-# graviton
-#mc20_13TeV.504648.aMCPy8EG_A14NNPDF23LO_Hjj_m3000w50.deriv.DAOD_FTAG1.e8418_s3681_r13144_p5770
-
-# more VR specific samples (mc20a+d+e)
-#mc20_13TeV.427080.Pythia8EvtGen_A14NNPDF23LO_flatpT_Zprime.deriv.DAOD_FTAG1.e5362_s3681_r13167_p5770
-#mc20_13TeV.427080.Pythia8EvtGen_A14NNPDF23LO_flatpT_Zprime.deriv.DAOD_FTAG1.e5362_s3681_r13144_p5770
-#mc20_13TeV.427080.Pythia8EvtGen_A14NNPDF23LO_flatpT_Zprime.deriv.DAOD_FTAG1.e5362_s3681_r13145_p5770
-
-# alternative generators
-#mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_FTAG1.e6337_a899_r13144_p5770
-#mc20_13TeV.500568.MGPy8EG_NNPDF23ME_A14_ZPrime.deriv.DAOD_FTAG1.e7954_s3126_r13144_p5770
-#mc20_13TeV.500567.MGH7EG_NNPDF23ME_Zprime.deriv.DAOD_FTAG1.e7954_s3681_r13144_p5770
-#mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_a899_r13144_p5770
-
-#dijet and V+jets samples
-#mc20_13TeV.364702.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2WithSW.deriv.DAOD_FTAG1.e7142_s3681_r13144_p5770
-#mc20_13TeV.700321.Sh_2211_Zee_maxHTpTV2_CFilterBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700324.Sh_2211_Zmumu_maxHTpTV2_CFilterBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700335.Sh_2211_Znunu_pTV2_BFilter.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700323.Sh_2211_Zmumu_maxHTpTV2_BFilter.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700325.Sh_2211_Zmumu_maxHTpTV2_CVetoBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700337.Sh_2211_Znunu_pTV2_CVetoBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700332.Sh_2211_Ztautau_HH_maxHTpTV2_BFilter.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700334.Sh_2211_Ztautau_HH_maxHTpTV2_CVetoBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700333.Sh_2211_Ztautau_HH_maxHTpTV2_CFilterBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700322.Sh_2211_Zee_maxHTpTV2_CVetoBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700320.Sh_2211_Zee_maxHTpTV2_BFilter.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.700336.Sh_2211_Znunu_pTV2_CFilterBVeto.deriv.DAOD_FTAG1.e8351_s3681_r13144_p5770
-#mc20_13TeV.364705.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ5WithSW.deriv.DAOD_FTAG1.e7142_s3681_r13144_p5770
-#mc20_13TeV.364703.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ3WithSW.deriv.DAOD_FTAG1.e7142_s3681_r13144_p5770
-#mc20_13TeV.364704.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ4WithSW.deriv.DAOD_FTAG1.e7142_s3681_r13144_p5770
+mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3681_r13144_p6698
+mc20_13TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e7954_s3797_r13144_p6698
+mc23_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8514_s4162_r14622_p6698
+mc23_13p6TeV.800030.Py8EG_A14NNPDF23LO_flatpT_Zprime_Extended.deriv.DAOD_FTAG1.e8514_s4159_r15530_p6698
diff --git a/FTagDumper/test/test-dumper b/FTagDumper/test/test-dumper
index 400766d3ed76c2bfd724a8f74ac2f28561576a2e..8220c6bcc794e038a9df3b93dace1ddeda54e31b 100755
--- a/FTagDumper/test/test-dumper
+++ b/FTagDumper/test/test-dumper
@@ -71,8 +71,9 @@ TRIGGER_AOD=r15280/AOD.601479.e8514_e8528_s4159_s4114_r15280_tid37668991_00.smal
 TRIGGER_SAMPLEA=r15424/AOD.601229.e8514_e8528_s4162_s4114_r15424_tid38017958_00.small.pool.root
 TRIGGER_DATA=p6241/AOD.00473225.r15590_r15591_p6241.small.pool.root
 OFFLINE_PHYSVAL=p5627/DAOD_PHYSVAL.410470.e6337_s3681_r13144_p5627.small.pool.root
-OFFLINE_FTAG1=p6368/DAOD_FTAG1.601229.e8453_s3873_r13829_p6368.small.pool.root
+OFFLINE_FTAG1=p6698/DAOD_FTAG1.601589.e8549_s4162_r14622_p6698.small.pool.root
 OFFLINE_FTAG1_MC20=p6453/DAOD_FTAG1.410470.e6337_s3681_r13144_p6453.small.pool.root
+OFFLINE_FTAG1_FATJETS=p6368/DAOD_FTAG1.601229.e8453_s3873_r13829_p6368.small.pool.root
 OFFLINE_PHYS=p6266/DAOD_PHYS.601230.e8514_e8528_s4162_s4114_r15540_r15516_p6266.small.pool.root
 LLP1=r15540/DAOD_LLP1.mc23_13p6TeV.604242.PhPy8_ggF_H125_a16a16_4b_ctau100_filtered.e8582_e8586_s4162_s4114_r15540.small.pool.root
 
@@ -83,8 +84,8 @@ declare -A DATAFILES=(
     [slim]=${OFFLINE_FTAG1}
     [truth]=${OFFLINE_FTAG1}
     [truthjets]=${OFFLINE_PHYSVAL}
-    [fatjets]=${OFFLINE_FTAG1}
-    [fatjets-muonCorr]=${OFFLINE_FTAG1}
+    [fatjets]=${OFFLINE_FTAG1_FATJETS}
+    [fatjets-muonCorr]=${OFFLINE_FTAG1_FATJETS}
     [softe]=${OFFLINE_FTAG1}
     [minimal]=${OFFLINE_FTAG1}
     [athena]=${OFFLINE_FTAG1}
diff --git a/configs/EMPFlow.json b/configs/EMPFlow.json
index 5753c85dc81cb40f23de0986ceb7f6c1674ad794..16e8c325c7e91bb82b70cddc377e94fba2e5a923 100644
--- a/configs/EMPFlow.json
+++ b/configs/EMPFlow.json
@@ -28,9 +28,6 @@
                 "GN120220509_pb",
                 "GN120220509_pc",
                 "GN120220509_pu",
-                "GN2v00_pb",
-                "GN2v00_pc",
-                "GN2v00_pu",
                 "GN2v01_pb",
                 "GN2v01_pc",
                 "GN2v01_pu",
diff --git a/configs/EMPFlowSlim.json b/configs/EMPFlowSlim.json
index 0f7140fee504ed3ff24722a82776de75a48bc9c3..72f212c763dfdc1257123ef170bd6bb0b697de86 100644
--- a/configs/EMPFlowSlim.json
+++ b/configs/EMPFlowSlim.json
@@ -25,9 +25,6 @@
     "variables": {
         "file": "fragments/pflow-variables.json",
         "btagging": {
-            "chars": [
-                "rnnip_isDefaults"
-            ],
             "floats": [
                 "DL1dv01_pu",
                 "DL1dv01_pc",
diff --git a/configs/EMPFlow_all_flows.json b/configs/EMPFlow_all_flows.json
index b3148fcc141901cdcbb4156d65739ec3c023b99a..7c70b6d5c7f371e39c97874ec41feb084b40dc46 100644
--- a/configs/EMPFlow_all_flows.json
+++ b/configs/EMPFlow_all_flows.json
@@ -10,7 +10,7 @@
     "dl2_configs": [
     ],
     "variables": {
-        "file": "fragments/pflow-variables-all.json",
+        "file": "fragments/pflow-variables-slim.json",
         "jet": {
             "ints": [
                 "n_tracks"
@@ -18,9 +18,6 @@
         },
         "btagging": {
             "floats": [
-                "GN2v00_pb",
-                "GN2v00_pc",
-                "GN2v00_pu",
                 "GN2v01_pb",
                 "GN2v01_pc",
                 "GN2v01_pu",
diff --git a/configs/EMPFlow_extrap.json b/configs/EMPFlow_extrap.json
index e2b5690e1ac7bf1fa17e1b3aa70c7babb298837b..500406fd2286d41ed32999a4de63dffbdb779612 100644
--- a/configs/EMPFlow_extrap.json
+++ b/configs/EMPFlow_extrap.json
@@ -19,9 +19,6 @@
         },
         "btagging": {
             "floats": [
-                "GN2v00_pb",
-                "GN2v00_pc",
-                "GN2v00_pu",
                 "GN2v01_pb",
                 "GN2v01_pc",
                 "GN2v01_pu",
diff --git a/configs/GN3_dev.json b/configs/GN3_dev.json
index 2db00f11fa373f387c405b446f6f4cfd5aed5d76..4d14fec368537b1b45cb34218efe22475bc56d4a 100644
--- a/configs/GN3_dev.json
+++ b/configs/GN3_dev.json
@@ -27,7 +27,8 @@
         "default_mapping": {"file": "fragments/default-mapping.json"},
         "jet" : {
             "ints" : [
-                "n_tracks_dr", "n_tracks_ghost", "HadronConeExclTruthLabelIDFromNearestJet",
+                "n_tracks_dr", "n_tracks_ghost",
+                "HadronGhostTruthLabelIDFromNearestJet",
                 "n_b_tracks_ghost",
                 "n_bc_tracks_ghost",
                 "n_c_tracks_ghost",
@@ -49,7 +50,57 @@
                 "deltaPtToNearestJet",
                 "ptFromNearestJet",
                 "etaFromNearestJet",
-                "phiFromNearestJet"
+                "phiFromNearestJet",
+                "RNNJetScoreFromTauJet",
+                "RNNJetScoreSigTransFromTauJet",
+                "GNTauScore_v0pruneFromTauJet",
+                "GNTauScoreSigTrans_v0pruneFromTauJet",
+                "GNTauScore_v1truncFromTauJet",
+                "GNTauScoreSigTrans_v1truncFromTauJet",
+                "GN3V00_pb",
+                "GN3V00_pc",
+                "GN3V00_pu",
+                "GN3V00_ptau",
+                "GN3V00_ptFromTruthDressedWZJet",
+                "GN3PflowV00_pb",
+                "GN3PflowV00_pc",
+                "GN3PflowV00_pu",
+                "GN3PflowV00_ptau",
+                "GN3PflowV00_ptFromTruthDressedWZJet",
+                "GN3MuonsV00_pb",
+                "GN3MuonsV00_pc",
+                "GN3MuonsV00_pu",
+                "GN3MuonsV00_ptau",
+                "GN3MuonsV00_ptFromTruthDressedWZJet",
+                "GN3PflowMuonsV00_pb",
+                "GN3PflowMuonsV00_pc",
+                "GN3PflowMuonsV00_pu",
+                "GN3PflowMuonsV00_ps",
+                "GN3PflowMuonsV00_pud",
+                "GN3PflowMuonsV00_pg",
+                "GN3PflowMuonsV00_pquark",
+                "GN3PflowMuonsV00_ptau",
+                "GN3PflowMuonsV00_ptFromTruthDressedWZJet",
+                "GN3V00SimpleFlip_pb",
+                "GN3V00SimpleFlip_pc",
+                "GN3V00SimpleFlip_pu",
+                "GN3V00SimpleFlip_ptau",
+                "GN3PflowV00SimpleFlip_pb",
+                "GN3PflowV00SimpleFlip_pc",
+                "GN3PflowV00SimpleFlip_pu",
+                "GN3PflowV00SimpleFlip_ptau",
+                "GN3MuonsV00SimpleFlip_pb",
+                "GN3MuonsV00SimpleFlip_pc",
+                "GN3MuonsV00SimpleFlip_pu",
+                "GN3MuonsV00SimpleFlip_ptau",
+                "GN3PflowMuonsV00SimpleFlip_pb",
+                "GN3PflowMuonsV00SimpleFlip_pc",
+                "GN3PflowMuonsV00SimpleFlip_pu",
+                "GN3PflowMuonsV00SimpleFlip_ps",
+                "GN3PflowMuonsV00SimpleFlip_pud",
+                "GN3PflowMuonsV00SimpleFlip_pg",
+                "GN3PflowMuonsV00SimpleFlip_pquark",
+                "GN3PflowMuonsV00SimpleFlip_ptau"
             ],
             "chars": ["matchedToTruthJet", "matchedToTruthDressedWZJet", "matchedToTruthTaus"]
         },
@@ -58,15 +109,7 @@
                 "GN2v01_pb",
                 "GN2v01_pc",
                 "GN2v01_pu",
-                "GN2v01_ptau",
-                "GN2NoAux_pb",
-                "GN2NoAux_pc",
-                "GN2NoAux_pu",
-                "GN2NoAux_ptau",
-                "GN2Lep_pb",
-                "GN2Lep_pc",
-                "GN2Lep_pu",
-                "GN2Lep_ptau"
+                "GN2v01_ptau"
             ]
         }
     },
@@ -136,12 +179,26 @@
             "floats_to_copy" : ["pt"],
             "pt_priority_with_delta_r": 0.3
         },
+        {
+            "block": "JetMatcher",
+            "source_jets" : ["TauJets"],
+            "source_name" : "TauJet",
+            "floats_to_copy" : [
+                "RNNJetScore",
+                "RNNJetScoreSigTrans",
+                "GNTauScore_v0prune",
+                "GNTauScoreSigTrans_v0prune",
+                "GNTauScore_v1trunc",
+                "GNTauScoreSigTrans_v1trunc"
+            ],
+            "pt_priority_with_delta_r": 0.3
+        },
         {
             "block": "JetMatcher",
             "source_jets" : ["AntiKt4EMPFlowJets"],
             "source_name" : "NearestJet",
             "floats_to_copy" : ["pt", "eta", "phi"],
-            "ints_to_copy" : ["HadronConeExclTruthLabelID"]
+            "ints_to_copy" : ["HadronGhostTruthLabelID"]
         },
         {
             "block": "TruthTauMatcher",
@@ -159,24 +216,6 @@
                 "GN2v01_TrackOrigin": "GN2v01_aux_TrackOrigin"
             }
         },
-        {
-            "block": "MultifoldTagger",
-            "nn_paths": [
-                "dev/BTagging/20240408/GN2v01NoAux/antikt4empflow/network_fold0.onnx",
-                "dev/BTagging/20240408/GN2v01NoAux/antikt4empflow/network_fold1.onnx",
-                "dev/BTagging/20240408/GN2v01NoAux/antikt4empflow/network_fold2.onnx",
-                "dev/BTagging/20240408/GN2v01NoAux/antikt4empflow/network_fold3.onnx"
-            ]
-        },
-        {
-            "block": "MultifoldTagger",
-            "nn_paths": [
-                "dev/BTagging/20240627/GN2v01Lep/antikt4empflow/network_fold0.onnx",
-                "dev/BTagging/20240627/GN2v01Lep/antikt4empflow/network_fold1.onnx",
-                "dev/BTagging/20240627/GN2v01Lep/antikt4empflow/network_fold2.onnx",
-                "dev/BTagging/20240627/GN2v01Lep/antikt4empflow/network_fold3.onnx"
-            ]
-        },
         {
             "block" : "SoftElectronsDecorator",
             "decorate_vars" : true,
diff --git a/configs/fragments/pflow-base.json b/configs/fragments/pflow-base.json
index 2ac5fc4731cc649d72390b078fab9e14792161a9..1c1304eaf29e8b78f2b4d6bde69bac293d419f94 100644
--- a/configs/fragments/pflow-base.json
+++ b/configs/fragments/pflow-base.json
@@ -5,7 +5,7 @@
     "vertex_collection": "PrimaryVertices",
     "truth_vertex_collection": "TruthPrimaryVertices",
     "variables": {
-        "file": "pflow-variables-all.json",
+        "file": "pflow-variables-slim.json",
         "default_mapping": {
             "file": "default-mapping.json"
         }