diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py
index 1c651db5b467de0b8a0f52e523eae5fa92560251..c61845124da1fcba577901eba81fa67c59ce5eb1 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py
@@ -12,7 +12,7 @@ class StaticPEBInfoWriterToolCfg(StaticPEBInfoWriterTool):
         self.ROBList.extend(robs)
 
     def addSubDets(self, dets):
-        self.SubDetList.extend(dets)
+        self.SubDetList.extend([int(detid) for detid in dets])
 
     def addHLTResultToROBList(self, moduleId=getFullHLTResultID()):
         hltResultSID = SourceIdentifier(SubDetector.TDAQ_HLT, moduleId)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
index 06d20f66a81e7215348da2e7a57e4cd6fd203c90..718c7702cf6248ff2427c1c08c1891cd3edd5a67 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
@@ -7,6 +7,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, MenuSeque
 from TrigPartialEventBuilding.TrigPartialEventBuildingConf import PEBInfoWriterAlg
 from TrigPartialEventBuilding.TrigPartialEventBuildingConfig import StaticPEBInfoWriterToolCfg, RoIPEBInfoWriterToolCfg
 from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from libpyeformat_helper import SubDetector
 from AthenaCommon.CFElements import seqAND, findAlgorithm
 from AthenaCommon.Logging import logging
 log = logging.getLogger('EventBuildingSequenceSetup')
@@ -43,7 +44,20 @@ def pebInfoWriterTool(name, eventBuildType):
     Create PEBInfoWriterTool configuration for the eventBuildType
     '''
     tool = None
-    if 'LArPEB' in eventBuildType:
+    if 'BeamSpotPEB' in eventBuildType:
+        tool = StaticPEBInfoWriterToolCfg(name)
+        tool.addSubDets([
+            SubDetector.PIXEL_BARREL,
+            SubDetector.PIXEL_DISK_SIDE, # note different name in C++, ADHI-4753
+            SubDetector.PIXEL_B_LAYER,
+            SubDetector.PIXEL_IBL,
+            SubDetector.SCT_BARREL_A_SIDE,
+            SubDetector.SCT_BARREL_C_SIDE,
+            SubDetector.SCT_ENDCAP_A_SIDE,
+            SubDetector.SCT_ENDCAP_C_SIDE,
+            SubDetector.TDAQ_CTP
+        ])
+    elif 'LArPEB' in eventBuildType:
         tool = RoIPEBInfoWriterToolCfg(name)
         tool.DetNames = ['PIXEL', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']
         # TODO: tool.MaxRoIsPerEvent = 5
@@ -51,7 +65,7 @@ def pebInfoWriterTool(name, eventBuildType):
         tool.addCTPResultToROBList()  # add the CTP result to the list
     elif 'RPCPEBSecondaryReadout' in eventBuildType:
         tool = StaticPEBInfoWriterToolCfg(name)
-        tool.ROBList = [0x610080, 0x620080]
+        tool.addROBs([0x610080, 0x620080])
     elif eventBuildType in EventBuildingInfo.getAllDataScoutingIdentifiers():
         # Pure DataScouting configuration
         tool = StaticPEBInfoWriterToolCfg(name)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py
index f125e83fbece6ea6bab35c66d4ec17d3a490fe25..67ab9b35c79b8c19bb00efe630a0226594d14b1d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py
@@ -16,6 +16,7 @@ LArPEB, LumiPEB, RPCPEB, RPCPEBSecondaryReadout, TrkPEB, JetDS, PhotonDS
 
 # PEB identifiers
 PartialEventBuildingIdentifiers = [
+  'BeamSpotPEB',
   'LArPEB',
   'RPCPEBSecondaryReadout'
 ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index db34b321bdc10e0c65724899a8b89633a1f0198a..01a27d13d300a91d51b0f3c01eeaff0d400a5a44 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -105,7 +105,7 @@ def setupMenu():
    ]
     TriggerFlags.HeavyIonSlice.signatures  = []
     TriggerFlags.BeamspotSlice.signatures  = [
-        ChainProp(name='HLT_beamspot_allTE_trkfast_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
+        ChainProp(name='HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
         #ChainProp(name='HLT_beamspot_activeTE_trkfast_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
         #ChainProp(name='HLT_beamspot_trkFS_trkfast_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
     ]