diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
index feadf4f0d..284075be3 100644
--- a/fcl/caf/cafmaker_defs.fcl
+++ b/fcl/caf/cafmaker_defs.fcl
@@ -14,6 +14,7 @@
 #include "eventweight_genie_sbn.fcl"
 #include "eventweight_genie_systtools.fcl"
 #include "eventweight_flux_sbn.fcl"
+#include "eventweight_geant4_sbn.fcl"
 #include "mcsproducer.fcl"
 #include "rangeproducer.fcl"
 #include "flashmatch_simple_icarus.fcl"
@@ -102,6 +103,7 @@ recoana_caf_preprocess_producers: {
   genieweight: @local::sbn_eventweight_genie
   systtools: @local::sbn_systtools
   fluxweight: @local::sbn_eventweight_flux
+  geant4weight: @local::sbn_eventweight_geant4
 }
 
 # Overwrite labels
@@ -121,6 +123,7 @@ recoana_caf_preprocess_producers.pandoraPidGausCryoW.CalorimetryModuleLabel: "pa
 
 recoana_caf_preprocess_producers.genieweight.weight_functions: @local::recoana_caf_preprocess_producers.genieweight.weight_functions_genie
 recoana_caf_preprocess_producers.fluxweight.weight_functions: @local::recoana_caf_preprocess_producers.fluxweight.weight_functions_flux
+recoana_caf_preprocess_producers.geant4weight.weight_functions: @local::recoana_caf_preprocess_producers.geant4weight.weight_functions_reint
 
 # Producers for making SCE products
 recoana_sce_producers: {
@@ -253,7 +256,7 @@ caf_preprocess_data_sequence: [
     ShowerCosmicDistCryoE, ShowerCosmicDistCryoW
     ]
 
-caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight]
+caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight, geant4weight]
 
 caf_preprocess_sce_sequence: [ 
   # Run the SCE correction
@@ -275,7 +278,7 @@ caf_preprocess_sce_sequence: [
   # TODO: rns??
 ]
 
-caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight]
+caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight, geant4weight]
 
 # CAFMaker config
 cafmaker: @local::standard_cafmaker
diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl
index 37193a73a..a80878e66 100644
--- a/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl
+++ b/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl
@@ -2,9 +2,9 @@
 
 # overwrite the producers to use data versions
 physics.producers: @local::caf_preprocess_data_producers
-physics.runprod: [ @sequence::caf_preprocess_data_sequence, rns, systtools, fluxweight, cafmaker]
+physics.runprod: [ @sequence::caf_preprocess_data_sequence, rns, systtools, geant4weight, fluxweight, cafmaker]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]
 
 #include "cafmaker_add_detsim2d_icarus.fcl"
 #include "cafmaker_add_overlay_icarus.fcl"
diff --git a/fcl/caf/cafmakerjob_icarus_sce_systtools.fcl b/fcl/caf/cafmakerjob_icarus_sce_systtools.fcl
index 6b5e0cbc0..031ea2cfb 100644
--- a/fcl/caf/cafmakerjob_icarus_sce_systtools.fcl
+++ b/fcl/caf/cafmakerjob_icarus_sce_systtools.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus_sce.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, geant4weight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight"]
 
diff --git a/fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl b/fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl
index e4732e3ec..9a33ddb9c 100644
--- a/fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl
+++ b/fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus_sce.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, fluxweight, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, geant4weight, fluxweight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]
 
diff --git a/fcl/caf/cafmakerjob_icarus_systtools.fcl b/fcl/caf/cafmakerjob_icarus_systtools.fcl
index 94ebf3e09..d5c0670ce 100644
--- a/fcl/caf/cafmakerjob_icarus_systtools.fcl
+++ b/fcl/caf/cafmakerjob_icarus_systtools.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, geant4weight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight"]
 
diff --git a/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl b/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
index 7ba1d48a3..b456f0c17 100644
--- a/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
+++ b/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, fluxweight, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, geant4weight, fluxweight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]
 
diff --git a/ups/product_deps b/ups/product_deps
index 735740258..60310fa1f 100644
--- a/ups/product_deps
+++ b/ups/product_deps
@@ -256,7 +256,7 @@ icarus_signal_processing	v10_06_00_01	-
 icarusalg			v10_06_00_04	-
 icarusutil			v10_06_00_04	-
 libwda				v2_30_0a	-
-sbncode				v10_06_00_04	-
+sbncode				v10_06_00_05	-
 cetmodules			v3_24_01	-	only_for_build
 end_product_list
 ####################################