diff --git a/options/Boole/PR-Run3-Integration-spillover.py b/options/Boole/PR-2024-Integration-Spillover.py
similarity index 89%
rename from options/Boole/PR-Run3-Integration-spillover.py
rename to options/Boole/PR-2024-Integration-Spillover.py
index fc9e6bf3c68ab99611b893d7bfce0a2db2908322..04dece23a1ae1eed86ff2f062df633cb75bf0038 100644
--- a/options/Boole/PR-Run3-Integration-spillover.py
+++ b/options/Boole/PR-2024-Integration-Spillover.py
@@ -12,11 +12,11 @@ from Gaudi.Configuration import *
 from Configurables import Boole
 from GaudiConf import IOHelper
 
-importOptions("$APPCONFIGOPTS/Boole/Default.py")
+importOptions("$BOOLEOPTS/General/Boole-2024.py")
 importOptions("$APPCONFIGOPTS/Boole/Boole-Upgrade-IntegratedLumi.py")
 importOptions("$APPCONFIGOPTS/Persistency/Compression-ZLIB-1.py")
 
-testName = "PR-Run3-Integration-spillover"
+testName = "PR-2024-Integration-Spillover"
 
 Boole().EvtMax = 1000
 Boole().UseSpillover = True
@@ -29,4 +29,4 @@ Boole().Outputs = []
 from PRConfig import TestFileDB
 TestFileDB.test_file_db['upgrade_2024.Q1.2_BsToPhiPhi_md_sim'].run()
 
-HistogramPersistencySvc().OutputFile = "Boole-histos.root"
+# HistogramPersistencySvc().OutputFile = "Boole-histos.root"
diff --git a/options/Boole/PR-2024-Integration-noSpillover.py b/options/Boole/PR-2024-Integration-noSpillover.py
new file mode 100644
index 0000000000000000000000000000000000000000..57b161d0e29e66f6946c40a28783183259538639
--- /dev/null
+++ b/options/Boole/PR-2024-Integration-noSpillover.py
@@ -0,0 +1,30 @@
+###############################################################################
+# (c) Copyright 2000-2022 CERN for the benefit of the LHCb Collaboration      #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+from Gaudi.Configuration import *
+from Configurables import Boole
+from GaudiConf import IOHelper
+
+importOptions("$BOOLEOPTS/General/Boole-2024.py")
+importOptions("$APPCONFIGOPTS/Boole/Boole-Upgrade-IntegratedLumi.py")
+importOptions("$APPCONFIGOPTS/Persistency/Compression-ZLIB-1.py")
+
+testName = "PR-2024-Integration-noSpillover"
+
+Boole().EvtMax = 1000
+Boole().InputDataType = "SIM"
+#Boole().Histograms = "Expert"
+Boole().DatasetName = testName
+Boole().Outputs = []
+
+from PRConfig import TestFileDB
+TestFileDB.test_file_db['upgrade_2024.Q1.2_BsToPhiPhi_md_sim'].run()
+
+# HistogramPersistencySvc().OutputFile = "Boole-histos.root"
diff --git a/options/Boole/PR-Run3-Integration-Spillover.py b/options/Boole/PR-Run3-Integration-Spillover.py
new file mode 100644
index 0000000000000000000000000000000000000000..38f8635816c865bcd12a7e85ea7d3cbe51c191ca
--- /dev/null
+++ b/options/Boole/PR-Run3-Integration-Spillover.py
@@ -0,0 +1,32 @@
+###############################################################################
+# (c) Copyright 2000-2022 CERN for the benefit of the LHCb Collaboration      #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+from Gaudi.Configuration import *
+from Configurables import Boole
+from GaudiConf import IOHelper
+
+importOptions("$BOOLEOPTS/General/Boole-Run3.py")
+importOptions("$APPCONFIGOPTS/Boole/Boole-Upgrade-IntegratedLumi.py")
+importOptions("$APPCONFIGOPTS/Persistency/Compression-ZLIB-1.py")
+
+testName = "PR-Run3-Integration-Spillover"
+
+Boole().EvtMax = 1000
+Boole().UseSpillover = True
+Boole().SpilloverPaths = ["Prev", "PrevPrev", "Next", "NextNext"]
+Boole().InputDataType = "SIM"
+#Boole().Histograms = "Expert"
+Boole().DatasetName = testName
+Boole().Outputs = []
+
+from PRConfig import TestFileDB
+TestFileDB.test_file_db['upgrade_2024.Q1.2_BsToPhiPhi_md_sim'].run()
+
+# HistogramPersistencySvc().OutputFile = "Boole-histos.root"
diff --git a/options/Boole/PR-Run3-Integration-noSpillover.py b/options/Boole/PR-Run3-Integration-noSpillover.py
index 4c6c69cd193357a8a80cc9e3dab984799317d9bb..ca92d706f7884056ecc988965dfa163575b0f48b 100644
--- a/options/Boole/PR-Run3-Integration-noSpillover.py
+++ b/options/Boole/PR-Run3-Integration-noSpillover.py
@@ -12,7 +12,7 @@ from Gaudi.Configuration import *
 from Configurables import Boole
 from GaudiConf import IOHelper
 
-importOptions("$APPCONFIGOPTS/Boole/Default.py")
+importOptions("$BOOLEOPTS/General/Boole-Run3.py")
 importOptions("$APPCONFIGOPTS/Boole/Boole-Upgrade-IntegratedLumi.py")
 importOptions("$APPCONFIGOPTS/Persistency/Compression-ZLIB-1.py")
 
@@ -27,4 +27,4 @@ Boole().Outputs = []
 from PRConfig import TestFileDB
 TestFileDB.test_file_db['upgrade_2024.Q1.2_BsToPhiPhi_md_sim'].run()
 
-HistogramPersistencySvc().OutputFile = "Boole-histos.root"
+# HistogramPersistencySvc().OutputFile = "Boole-histos.root"