diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data.fcl b/sbndcode/JobConfigurations/base/cafmakerjob_sbnd_data_base.fcl
similarity index 99%
rename from sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data.fcl
rename to sbndcode/JobConfigurations/base/cafmakerjob_sbnd_data_base.fcl
index d4087ea22..8f057091d 100644
--- a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data.fcl
+++ b/sbndcode/JobConfigurations/base/cafmakerjob_sbnd_data_base.fcl
@@ -170,4 +170,3 @@ physics.producers.cafmaker.FlashMatchSCECryoSuffixes: [""]
 
 # input art file.
 physics.producers.cafmaker.SystWeightLabels: []
-
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnblight.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnblight.fcl
new file mode 100644
index 000000000..68b75e483
--- /dev/null
+++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnblight.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_data_base.fcl"
+
+physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbinfo"
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnbzerobias.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnbzerobias.fcl
new file mode 100644
index 000000000..84e7e3807
--- /dev/null
+++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnbzerobias.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_data_base.fcl"
+
+physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbzerobiasinfo"
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_offbeamlight.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_offbeamlight.fcl
new file mode 100644
index 000000000..78e2f349e
--- /dev/null
+++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_offbeamlight.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_data_base.fcl"
+
+physics.producers.cafmaker.OffbeamBNBCountDataLabel: "sbndbnbextinfo"
diff --git a/test/ci/sbnd_ci_data_offBeamZeroBias_caf_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_data_offBeamZeroBias_caf_quick_test_sbndcode.fcl
index d06f37d18..07290c65f 100644
--- a/test/ci/sbnd_ci_data_offBeamZeroBias_caf_quick_test_sbndcode.fcl
+++ b/test/ci/sbnd_ci_data_offBeamZeroBias_caf_quick_test_sbndcode.fcl
@@ -1,4 +1,4 @@
-#include "cafmakerjob_sbnd_data.fcl"
+#include "cafmakerjob_sbnd_data_base.fcl"
 
 services.NuRandomService.policy: "perEvent"