diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
index 618185770fe95..d996793e931cb 100644
--- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -4,7 +4,7 @@
 # Define here the BeamSpotOnline record name,
 # it will be used both in BeamMonitor setup and in payload creation/upload
 BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd'
-BSOnlineTag = 'BeamSpotOnlinetLegacy'
+BSOnlineTag = 'BeamSpotOnlineLegacy'
 BSOnlineJobName = 'BeamSpotOnlineLegacy'
 BSOnlineOmsServiceUrl = 'http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'
 useLockRecords = True
@@ -83,6 +83,13 @@
     # you may need to set manually the GT in the line below
     #process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
 
+#--------------------------------------------------------
+# Swap offline <-> online BeamSpot as in Express and HLT
+import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
+process.BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone()
+import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
+process.offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
+
 #----------------------------
 # BeamMonitor
 process.load("DQM.BeamMonitor.BeamMonitor_Pixel_cff")
@@ -166,7 +173,7 @@
 
 import DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi
 process.pixelTracksMonitor = DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi.TrackerCollisionTrackMon.clone(
-   FolderName                = 'BeamMonitor/Tracking/pixelTracks',
+   FolderName                = 'BeamMonitorLegacy/Tracking/pixelTracks',
    TrackProducer             = 'pixelTracks',
    allTrackProducer          = 'pixelTracks',
    beamSpot                  = "offlineBeamSpot",
@@ -213,7 +220,7 @@
 
 #
 process.selectedPixelTracksMonitor = process.pixelTracksMonitor.clone(
-   FolderName       = 'BeamMonitor/Tracking/selectedPixelTracks',
+   FolderName       = 'BeamMonitorLegacy/Tracking/selectedPixelTracks',
    TrackProducer    = 'tracks2monitor',
    allTrackProducer = 'tracks2monitor'
 )
@@ -248,7 +255,7 @@
 # BeamSpotProblemMonitor
 
 #
-process.dqmBeamSpotProblemMonitor.monitorName = "BeamMonitor/BeamSpotProblemMonitor"
+process.dqmBeamSpotProblemMonitor.monitorName = "BeamMonitorLegacy/BeamSpotProblemMonitor"
 process.dqmBeamSpotProblemMonitor.AlarmONThreshold  = 15 # was 10
 process.dqmBeamSpotProblemMonitor.AlarmOFFThreshold = 17 # was 12
 process.dqmBeamSpotProblemMonitor.nCosmicTrk        = 10
@@ -304,6 +311,7 @@
 process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")
 
 process.dqmBeamMonitor.OnlineMode = True
+process.dqmBeamMonitor.monitorName = "BeamMonitorLegacy"
 process.dqmBeamMonitor.recordName = BSOnlineRecordName
 process.dqmBeamMonitor.useLockRecords = useLockRecords
 
@@ -321,11 +329,13 @@
 process.pixelVertices = pixelVertices.clone(
   TkFilterParameters = dict( minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin)
 )
-process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4
-process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 12
-process.pixelTracksTrackingRegions.RegionPSet.originXPos =  0.08
-process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03
-process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0.
+#process.pixelTracksTrackingRegions.RegionPSet.ptMin = 0.1       # used in PilotBeam 2021, but not ok for standard collisions
+process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4 # used in PilotBeam 2021, to be checked again for standard collisions
+# The following parameters were used in 2018 HI:
+#process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 12
+#process.pixelTracksTrackingRegions.RegionPSet.originXPos =  0.08
+#process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03
+#process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0.
 
 process.tracking_FirstStep = cms.Sequence(
       process.siPixelDigis 
diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
index c02e5ce3de1c3..0cfe0411920fb 100644
--- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
@@ -120,22 +120,28 @@
 from DQM.Integration.config.online_customizations_cfi import *
 process = customise(process)
 
+#-----------------------------------------------------------
+# Swap offline <-> online BeamSpot as in Express and HLT
+import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
+process.BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone()
+import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
+process.offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
+
 #--------------------------
 # Proton-Proton Stuff
 #--------------------------
 
 if (process.runType.getRunType() == process.runType.pp_run or
     process.runType.getRunType() == process.runType.pp_run_stage1 or
-    process.runType.getRunType() == process.runType.cosmic_run or
-    process.runType.getRunType() == process.runType.cosmic_run_stage1 or 
     process.runType.getRunType() == process.runType.hpu_run or
-    process.runType.getRunType() == process.runType.hi_run):
+    process.runType.getRunType() == process.runType.hi_run or
+    process.runType.getRunType() == process.runType.commissioning_run):
 
     print("[beamhlt_dqm_sourceclient-live_cfg]:: Running pp")
 
     process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")
 
-    process.dqmBeamMonitor.monitorName = 'BeamMonitor'
+    process.dqmBeamMonitor.monitorName = 'BeamMonitorHLT'
 
     process.dqmBeamMonitor.OnlineMode = True              
     process.dqmBeamMonitor.recordName = BSOnlineRecordName