diff --git a/Modules/EMCAL/include/EMCAL/CellTask.h b/Modules/EMCAL/include/EMCAL/CellTask.h
index 090281348a..8f5d97877b 100644
--- a/Modules/EMCAL/include/EMCAL/CellTask.h
+++ b/Modules/EMCAL/include/EMCAL/CellTask.h
@@ -24,6 +24,7 @@
 #include "CommonDataFormat/RangeReference.h"
 #include "Headers/DataHeader.h"
 #include "DataFormatsEMCAL/TriggerRecord.h"
+#include "QualityControl/PostProcessingInterface.h"
 
 class TH1;
 class TH2;
diff --git a/Modules/EMCAL/src/CalibMonitoringTask.cxx b/Modules/EMCAL/src/CalibMonitoringTask.cxx
index 8d0e412ba6..51dab8a927 100644
--- a/Modules/EMCAL/src/CalibMonitoringTask.cxx
+++ b/Modules/EMCAL/src/CalibMonitoringTask.cxx
@@ -268,7 +268,7 @@ void CalibMonitoringTask::update(Trigger t, framework::ServiceRegistryRef)
   reset();
   for (const auto& obj : mCalibObjects) {
     if (obj == "BadChannelMap") {
-      mBadChannelMap = mCalibDB->readBadChannelMap(o2::ccdb::getCurrentTimestamp(), metadata);
+      mBadChannelMap = mCalibDB->readBadChannelMap(t.timestamp, metadata);
       if (!mBadChannelMap) {
         ILOG(Info, Support) << "No Bad Channel Map object " << ENDM;
         continue;
@@ -310,7 +310,7 @@ void CalibMonitoringTask::update(Trigger t, framework::ServiceRegistryRef)
     }
 
     if (obj == "TimeCalibParams") {
-      mTimeCalib = mCalibDB->readTimeCalibParam(o2::ccdb::getCurrentTimestamp(), metadata);
+      mTimeCalib = mCalibDB->readTimeCalibParam(t.timestamp, metadata);
       if (!mTimeCalib) {
         ILOG(Info, Support) << " No Time Calib object " << ENDM;
         continue;
@@ -324,7 +324,7 @@ void CalibMonitoringTask::update(Trigger t, framework::ServiceRegistryRef)
       }
     }
     if (obj == "FeeDCS") {
-      mFeeDCS = mCalibDB->readFeeDCSData(o2::ccdb::getCurrentTimestamp(), metadata);
+      mFeeDCS = mCalibDB->readFeeDCSData(t.timestamp, metadata);
       if (!mFeeDCS) {
         ILOG(Info, Support) << " No FEE DCS object " << ENDM;
         continue;
diff --git a/Modules/EMCAL/src/CellTask.cxx b/Modules/EMCAL/src/CellTask.cxx
index 7bbd76586e..aef36f9bad 100644
--- a/Modules/EMCAL/src/CellTask.cxx
+++ b/Modules/EMCAL/src/CellTask.cxx
@@ -38,6 +38,7 @@
 #include <Framework/InputRecord.h>
 #include <Framework/InputRecordWalker.h>
 #include <CommonConstants/Triggers.h>
+#include "EMCAL/DrawGridlines.h"
 #include <set>
 
 namespace o2::quality_control_modules::emcal
@@ -1051,6 +1052,9 @@ void CellTask::CellHistograms::fillHistograms(const o2::emcal::Cell& cell, bool
   } catch (o2::emcal::InvalidCellIDException& e) {
     ILOG(Info, Support) << "Invalid cell ID: " << e.getCellID() << ENDM;
   }
+
+  o2::quality_control_modules::emcal::DrawGridlines::DrawSMGridInTriggerGeo(mCellOccupancyThr);
+  o2::quality_control_modules::emcal::DrawGridlines::DrawSMGridInTriggerGeo(mCellOccupancyThrBelow);
 }
 
 void CellTask::CellHistograms::countEvent()