diff --git a/DQM/EcalMonitorTasks/python/CollectionTags_cfi.py b/DQM/EcalMonitorTasks/python/CollectionTags_cfi.py
index d74cc11fae1f8..260702d0e72f2 100644
--- a/DQM/EcalMonitorTasks/python/CollectionTags_cfi.py
+++ b/DQM/EcalMonitorTasks/python/CollectionTags_cfi.py
@@ -45,16 +45,17 @@
     EEBasicCluster = cms.untracked.InputTag("particleFlowClusterECAL"),
     EBSuperCluster = cms.untracked.InputTag("particleFlowSuperClusterECAL", "particleFlowSuperClusterECALBarrel"),
     EESuperCluster = cms.untracked.InputTag("particleFlowSuperClusterECAL", "particleFlowSuperClusterECALEndcapWithPreshower"),
-    EBCpuDigi = cms.untracked.InputTag("ecalDigis@cpu", "ebDigis"),
-    EECpuDigi = cms.untracked.InputTag("ecalDigis@cpu", "eeDigis"),
-    EBGpuDigi = cms.untracked.InputTag("ecalDigis@cuda", "ebDigis"),
-    EEGpuDigi = cms.untracked.InputTag("ecalDigis@cuda", "eeDigis"),
-    EBCpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cpu", "EcalUncalibRecHitsEB"),
-    EECpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cpu", "EcalUncalibRecHitsEE"),
-    EBGpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cuda", "EcalUncalibRecHitsEB"),
-    EEGpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cuda", "EcalUncalibRecHitsEE"),
-    EBCpuRecHit = cms.untracked.InputTag("ecalRecHit@cpu", "EcalRecHitsEB"),
-    EECpuRecHit = cms.untracked.InputTag("ecalRecHit@cpu", "EcalRecHitsEE"),
-    EBGpuRecHit = cms.untracked.InputTag("ecalRecHit@cuda", "EcalRecHitsEB"),
-    EEGpuRecHit = cms.untracked.InputTag("ecalRecHit@cuda", "EcalRecHitsEE")
+    EBCpuDigi = cms.untracked.InputTag("hltEcalDigisLegacy", "ebDigis"),
+    EECpuDigi = cms.untracked.InputTag("hltEcalDigisLegacy", "eeDigis"),
+    EBGpuDigi = cms.untracked.InputTag("hltEcalDigisFromGPU", "ebDigis"),
+    EEGpuDigi = cms.untracked.InputTag("hltEcalDigisFromGPU", "eeDigis"),
+    EBCpuUncalibRecHit = cms.untracked.InputTag("hltEcalUncalibRecHitLegacy", "EcalUncalibRecHitsEB"),
+    EECpuUncalibRecHit = cms.untracked.InputTag("hltEcalUncalibRecHitLegacy", "EcalUncalibRecHitsEE"),
+    EBGpuUncalibRecHit = cms.untracked.InputTag("hltEcalUncalibRecHitFromSoA", "EcalUncalibRecHitsEB"),
+    EEGpuUncalibRecHit = cms.untracked.InputTag("hltEcalUncalibRecHitFromSoA", "EcalUncalibRecHitsEE"),
+    # RecHit GPU collection tags are temp placeholder
+    EBCpuRecHit = cms.untracked.InputTag("hltEcalRecHitWithoutTPs", "EcalRecHitsEB"),
+    EECpuRecHit = cms.untracked.InputTag("hltEcalRecHitWithoutTPs", "EcalRecHitsEE"),
+    EBGpuRecHit = cms.untracked.InputTag("hltEcalRecHitWithTPs", "EcalRecHitsEB"),
+    EEGpuRecHit = cms.untracked.InputTag("hltEcalRecHitWithTPs", "EcalRecHitsEE")
 )
diff --git a/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py b/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py
index 16c6d5e157ea3..792361e99bbe2 100644
--- a/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py
+++ b/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py
@@ -6,6 +6,16 @@
 from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal
 from DQM.EcalMonitorTasks.ecalGpuTask_cfi import ecalGpuTask
 
-gpuValidationEcal.toModify(ecalGpuTask.params, runGpuTask = True)
-gpuValidationEcal.toModify(ecalMonitorTask.workers, func = lambda workers: workers.append("GpuTask"))
-gpuValidationEcal.toModify(ecalMonitorTask, workerParameters = dict(GpuTask = ecalGpuTask))
+# Input tags used for offline DQM RECO, enables SwitchProducerCUDA to generate these collections
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EBCpuDigi = cms.untracked.InputTag("ecalDigis@cpu", "ebDigis"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EECpuDigi = cms.untracked.InputTag("ecalDigis@cpu", "eeDigis"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EBGpuDigi = cms.untracked.InputTag("ecalDigis@cuda", "ebDigis"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EEGpuDigi = cms.untracked.InputTag("ecalDigis@cuda", "eeDigis"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EBCpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cpu", "EcalUncalibRecHitsEB"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EECpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cpu", "EcalUncalibRecHitsEE"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EBGpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cuda", "EcalUncalibRecHitsEB"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EEGpuUncalibRecHit = cms.untracked.InputTag("ecalMultiFitUncalibRecHit@cuda", "EcalUncalibRecHitsEE"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EBCpuRecHit = cms.untracked.InputTag("ecalRecHit@cpu", "EcalRecHitsEB"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EECpuRecHit = cms.untracked.InputTag("ecalRecHit@cpu", "EcalRecHitsEE"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EBGpuRecHit = cms.untracked.InputTag("ecalRecHit@cuda", "EcalRecHitsEB"))
+gpuValidationEcal.toModify(ecalDQMCollectionTags, EEGpuRecHit = cms.untracked.InputTag("ecalRecHit@cuda", "EcalRecHitsEE"))
diff --git a/DQM/EcalMonitorTasks/python/EcalMonitorTask_cfi.py b/DQM/EcalMonitorTasks/python/EcalMonitorTask_cfi.py
index 2ffd474763694..f8b6719008422 100644
--- a/DQM/EcalMonitorTasks/python/EcalMonitorTask_cfi.py
+++ b/DQM/EcalMonitorTasks/python/EcalMonitorTask_cfi.py
@@ -14,6 +14,7 @@
 from DQM.EcalMonitorTasks.SelectiveReadoutTask_cfi import ecalSelectiveReadoutTask
 from DQM.EcalMonitorTasks.TimingTask_cfi import ecalTimingTask
 from DQM.EcalMonitorTasks.TrigPrimTask_cfi import ecalTrigPrimTask
+from DQM.EcalMonitorTasks.ecalGpuTask_cfi import ecalGpuTask
 
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
 ecalMonitorTask = DQMEDAnalyzer('EcalDQMonitorTask',
@@ -28,7 +29,8 @@
         "RawDataTask",
         "RecoSummaryTask",
         "TimingTask",
-        "TrigPrimTask"
+        "TrigPrimTask",
+        "GpuTask"
     ),
     # task parameters (included from indivitual cfis)
     workerParameters =  cms.untracked.PSet(
@@ -41,7 +43,8 @@
         RecoSummaryTask = ecalRecoSummaryTask,
         SelectiveReadoutTask = ecalSelectiveReadoutTask,
         TimingTask = ecalTimingTask,
-        TrigPrimTask = ecalTrigPrimTask
+        TrigPrimTask = ecalTrigPrimTask,
+        GpuTask = ecalGpuTask
     ),
     commonParameters = ecalCommonParams,
     collectionTags = ecalDQMCollectionTags,
diff --git a/DQM/EcalMonitorTasks/python/ecalGpuTask_cfi.py b/DQM/EcalMonitorTasks/python/ecalGpuTask_cfi.py
index 33a5aab647075..3f89fda341211 100644
--- a/DQM/EcalMonitorTasks/python/ecalGpuTask_cfi.py
+++ b/DQM/EcalMonitorTasks/python/ecalGpuTask_cfi.py
@@ -5,7 +5,7 @@
 
 ecalGpuTask = cms.untracked.PSet(
     params = cms.untracked.PSet(
-        runGpuTask = cms.untracked.bool(False),
+        runGpuTask = cms.untracked.bool(True),
 
         # Default plots for each object are 1D CPU distributions and 1D GPU-CPU diff
         enableDigi = cms.untracked.bool(True),