diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
index 6c676dc26..dac16b31e 100644
--- a/fcl/caf/cafmaker_defs.fcl
+++ b/fcl/caf/cafmaker_defs.fcl
@@ -334,6 +334,11 @@ cafmaker.SystWeightLabels: ["genieweight", "fluxweight"]
 cafmaker.SaveGENIEEventRecord: true # save GENIE event record by default. Turn this off for data cafmaker fcl
 cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatch"
 cafmaker.TrackHitFillRREndCut: 30 # include entire PID region
+cafmaker.PFOCharLabels.EndFractionName: "LArThreeDChargeFeatureTool_ICARUS_EndFraction" # override with some ICARUS-specific tool names
+cafmaker.PFOCharLabels.FractionalSpreadName: "LArThreeDChargeFeatureTool_ICARUS_FractionalSpread"
+cafmaker.PFOCharLabels.HaloTotalRatioName: "LArConeChargeFeatureTool_ICARUS_HaloTotalRatio"
+cafmaker.PFOCharLabels.ConcentrationName: "LArConeChargeFeatureTool_ICARUS_Concentration"
+cafmaker.PFOCharLabels.ConicalnessName: "LArConeChargeFeatureTool_ICARUS_Conicalness"
 
 # Add CAFMaker to the list of producers
 caf_preprocess_producers.cafmaker: @local::cafmaker
diff --git a/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml b/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
index f10f4226a..05ad25d9f 100644
--- a/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
+++ b/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
@@ -331,17 +331,22 @@
     <ShowerPfoListName>ShowerParticles3D</ShowerPfoListName>
     <UseThreeDInformation>true</UseThreeDInformation>
     <PersistFeatures>true</PersistFeatures>
-    <MvaFileName>PandoraBdt_v09_72_01_ICARUS_pfochar_bnb.xml</MvaFileName>
-    <MvaName>PfoCharBDT</MvaName>
-    <MvaFileNameNoChargeInfo>PandoraBdt_v09_72_01_ICARUS_pfochar_bnb.xml</MvaFileNameNoChargeInfo>
-    <MvaNameNoChargeInfo>PfoCharBDTNoChargeInfo</MvaNameNoChargeInfo>
+    <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
+    <MvaFileName>PFOCharBDT_v09_84_00_03_20250718_ICARUSCollection.xml</MvaFileName>
+    <MvaName>PFOCharBDT_v09_84_00_03_20250718_ICARUSCollection</MvaName>
+    <MvaFileNameNoChargeInfo>PFOCharBDT_v09_84_00_03_20250718_NoCharge.xml</MvaFileNameNoChargeInfo>
+    <MvaNameNoChargeInfo>PFOCharBDT_v09_84_00_03_20250718_NoCharge</MvaNameNoChargeInfo>
     <FeatureTools>
       <tool type = "LArThreeDLinearFitFeatureTool"/>
       <tool type = "LArThreeDVertexDistanceFeatureTool"/>
       <tool type = "LArThreeDPCAFeatureTool"/>
       <tool type = "LArThreeDOpeningAngleFeatureTool"/>
-      <tool type = "LArThreeDChargeFeatureTool"/>
-      <tool type = "LArConeChargeFeatureTool"/>
+      <tool type = "LArThreeDChargeFeatureTool_ICARUS">
+        <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
+      </tool>
+      <tool type = "LArConeChargeFeatureTool_ICARUS">
+        <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
+      </tool>
     </FeatureTools>
     <FeatureToolsNoChargeInfo>
       <tool type = "LArThreeDLinearFitFeatureTool"/>