diff --git a/test/ci/ci_tests.cfg b/test/ci/ci_tests.cfg
index b46e5fb1b..46aee463f 100644
--- a/test/ci/ci_tests.cfg
+++ b/test/ci/ci_tests.cfg
@@ -318,9 +318,8 @@ output1=%(TFILENAME)s
 STAGE_NAME=detsim
 INPUT_STAGE_NAME=g4
 NEVENTS=2
-# calibrated on sbndbuild01.fnal.gov on 20180305
 cpu_usage_range=200:700
-mem_usage_range=1000000:3000000
+mem_usage_range=1000000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)ssingle_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -342,7 +341,7 @@ INPUT_STAGE_NAME=detsim
 NEVENTS=2
 # calibrated on sbndbuild01.fnal.gov on 20180306
 cpu_usage_range=200:1000
-mem_usage_range=1000000:3300000
+mem_usage_range=1000000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)ssingle_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -410,7 +409,7 @@ INPUT_STAGE_NAME=reco2
 NEVENTS=2
 # calibrated on sbndbuild01.fnal.gov on 20180305
 cpu_usage_range=80:200
-mem_usage_range=1000000:3000000
+mem_usage_range=1000000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)ssingle_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -685,7 +684,7 @@ INPUT_STAGE_NAME=g4
 NEVENTS=2
 # calibrated on sbndbuild01.fnal.gov on 20180305
 cpu_usage_range=400:1000
-mem_usage_range=1000000:3000000
+mem_usage_range=1000000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)snucosmics_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -707,7 +706,7 @@ INPUT_STAGE_NAME=detsim
 NEVENTS=2
 # calibrated on sbndbuild01.fnal.gov on 20180305
 cpu_usage_range=100:1000
-mem_usage_range=1500000:3500000
+mem_usage_range=1500000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)snucosmics_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -729,7 +728,7 @@ INPUT_STAGE_NAME=reco1
 NEVENTS=2
 # calibrated on sbndbuild01.fnal.gov on 20180305
 cpu_usage_range=50:1250
-mem_usage_range=1000000:3000000
+mem_usage_range=1000000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)snucosmics_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -1023,7 +1022,7 @@ STAGE_NAME=reco1
 INPUT_STAGE_NAME=decoders
 NEVENTS=2
 cpu_usage_range=500:1500
-mem_usage_range=1500000:3000000
+mem_usage_range=1500000:7000000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)sdata_offBeamZeroBias_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -1043,7 +1042,7 @@ STAGE_NAME=reco2
 INPUT_STAGE_NAME=reco1
 NEVENTS=2
 cpu_usage_range=250:1000
-mem_usage_range=1000000:2000000
+mem_usage_range=1000000:2500000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)sdata_offBeamZeroBias_%(STAGE_NAME)s_quick_test_sbndcode.fcl
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 8585baa2e..7b13b759d 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_sce.fcl"
+#include "cafmakerjob_sbnd_data_sce_offbeamlight.fcl"
 
 services.NuRandomService.policy: "perEvent"
 
diff --git a/test/ci/sbnd_ci_nucosmics_caf_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_nucosmics_caf_quick_test_sbndcode.fcl
index c3c17ab41..bd50341b4 100644
--- a/test/ci/sbnd_ci_nucosmics_caf_quick_test_sbndcode.fcl
+++ b/test/ci/sbnd_ci_nucosmics_caf_quick_test_sbndcode.fcl
@@ -1,5 +1,5 @@
 #include "eventweight_genie_systtools_test.fcl"
-#include "cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl"
+#include "cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl"
 
 services.NuRandomService.policy: "perEvent"
 
diff --git a/test/ci/sbnd_ci_nucosmics_g4_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_nucosmics_g4_quick_test_sbndcode.fcl
index 5784ab3a4..10b23cab5 100644
--- a/test/ci/sbnd_ci_nucosmics_g4_quick_test_sbndcode.fcl
+++ b/test/ci/sbnd_ci_nucosmics_g4_quick_test_sbndcode.fcl
@@ -1,3 +1,3 @@
-#include "standard_g4_sbnd.fcl"
+#include "standard_g4_rockbox_sbnd.fcl"
 
 services.NuRandomService.policy: "perEvent"
diff --git a/test/ci/sbnd_ci_nucosmics_gen_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_nucosmics_gen_quick_test_sbndcode.fcl
index bfb3888e3..3f74ee533 100644
--- a/test/ci/sbnd_ci_nucosmics_gen_quick_test_sbndcode.fcl
+++ b/test/ci/sbnd_ci_nucosmics_gen_quick_test_sbndcode.fcl
@@ -1,5 +1,5 @@
 #include "messages_sbnd.fcl"
-#include "prodgenie_bnb_nu_cosmic_sbnd.fcl"
+#include "prodgenie_corsika_proton_rockbox0p1_sbnd.fcl"
 
 # non-interactive output settings, but keep them verbose
 services.message: @local::sbnd_message_services_prod_debug
diff --git a/test/ci/sbnd_ci_single_caf_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_single_caf_quick_test_sbndcode.fcl
index 40ee8d67c..ba272737a 100644
--- a/test/ci/sbnd_ci_single_caf_quick_test_sbndcode.fcl
+++ b/test/ci/sbnd_ci_single_caf_quick_test_sbndcode.fcl
@@ -1,4 +1,4 @@
-#include "cafmakerjob_sbnd_sce.fcl"
+#include "cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl"
 
 services.NuRandomService.policy: "perEvent"
 
diff --git a/test/ci/sbnd_ci_single_gen_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_single_gen_quick_test_sbndcode.fcl
index fced6dbba..3e9c131d0 100644
--- a/test/ci/sbnd_ci_single_gen_quick_test_sbndcode.fcl
+++ b/test/ci/sbnd_ci_single_gen_quick_test_sbndcode.fcl
@@ -1,5 +1,5 @@
 #include "messages_sbnd.fcl"
-#include "prodsingle_mu_3GeV_uniformupstream_fixangleforwardgoing.fcl"
+#include "prodgenie_corsika_proton_rockbox0p1_sbnd.fcl"
 
 # non-interactive output settings, but keep them verbose
 services.message: @local::sbnd_message_services_prod_debug