diff --git a/Modules/TRD/include/TRD/DigitsTask.h b/Modules/TRD/include/TRD/DigitsTask.h
index e1a49d8bd1..bcfa961fb2 100644
--- a/Modules/TRD/include/TRD/DigitsTask.h
+++ b/Modules/TRD/include/TRD/DigitsTask.h
@@ -76,14 +76,14 @@ class DigitsTask final : public TaskInterface
   std::shared_ptr<TH1F> mClsChargeTb;
   std::shared_ptr<TH1F> mClsNTb;
 
-  std::array<std::shared_ptr<TH2F>, 18> mHCMCM;
+  std::array<std::shared_ptr<TH2F>, o2::trd::constants::NSECTOR> mHCMCM;
 
   std::shared_ptr<TH1F> mPulseHeight = nullptr;
   std::shared_ptr<TH2F> mTotalPulseHeight2D = nullptr;
-  std::array<std::shared_ptr<TH1F>, 18> mPulseHeight2DperSM;
+  std::array<std::shared_ptr<TH1F>, o2::trd::constants::NSECTOR> mPulseHeight2DperSM;
   std::shared_ptr<TProfile> mPulseHeightpro = nullptr;
   std::shared_ptr<TProfile2D> mPulseHeightperchamber = nullptr;
-  std::vector<TH2F*> mLayers;
+  std::array<std::shared_ptr<TH2F>, o2::trd::constants::NLAYER> mLayers;
 
   // CCDB objects
   const o2::trd::NoiseStatusMCM* mNoiseMap = nullptr;
diff --git a/Modules/TRD/src/DigitsTask.cxx b/Modules/TRD/src/DigitsTask.cxx
index ad7c5ac610..1fa27f4225 100644
--- a/Modules/TRD/src/DigitsTask.cxx
+++ b/Modules/TRD/src/DigitsTask.cxx
@@ -34,8 +34,6 @@
 #include <map>
 #include <tuple>
 
-#include "CCDB/BasicCCDBManager.h"
-
 using namespace o2::quality_control_modules::common;
 using namespace o2::trd::constants;
 using Helper = o2::trd::HelperMethods;
@@ -221,7 +219,7 @@ void DigitsTask::buildHistograms()
     mNCls.reset(new TH1F("Cluster/NCls", "Total number of clusters per sector", 18, -0.5, 17.5));
     mNCls->SetTitle("Total number of clusters per sector;Sector;Counts");
     getObjectsManager()->startPublishing(mNCls.get());
-    mClsTb.reset(new TH2F("ClusterChargeTB", "Cluster charge;time bin;cluster charge", 30, -0.5, 29.5, 200, 0, 2000));
+    mClsTb.reset(new TH2F("Cluster/ChargeTB", "Cluster charge;time bin;cluster charge", 30, -0.5, 29.5, 200, 0, 2000));
     getObjectsManager()->startPublishing(mClsTb.get());
   }
 
@@ -249,13 +247,13 @@ void DigitsTask::buildHistograms()
   }
 
   for (int iLayer = 0; iLayer < NLAYER; ++iLayer) {
-    mLayers.push_back(new TH2F(Form("DigitsPerLayer_%i", iLayer), Form("Digit count per pad in layer %i;glb pad row;glb pad col", iLayer), 76, -0.5, 75.5, 2592, -0.5, 2591.5));
-    mLayers.back()->SetStats(0);
-    drawTrdLayersGrid(mLayers.back());
+    mLayers[iLayer].reset(new TH2F(Form("DigitsPerLayer_%i", iLayer), Form("Digit count per pad in layer %i;glb pad row;glb pad col", iLayer), 76, -0.5, 75.5, 2592, -0.5, 2591.5));
+    mLayers[iLayer]->SetStats(0);
+    drawTrdLayersGrid(mLayers[iLayer]);
     fillLinesOnHistsPerLayer(iLayer);
-    getObjectsManager()->startPublishing(mLayers.back());
-    getObjectsManager()->setDefaultDrawOptions(mLayers.back()->GetName(), "COLZ");
-    getObjectsManager()->setDisplayHint(mLayers.back(), "logz");
+    getObjectsManager()->startPublishing(mLayers[iLayer].get());
+    getObjectsManager()->setDefaultDrawOptions(mLayers[iLayer]->GetName(), "COLZ");
+    getObjectsManager()->setDisplayHint(mLayers[iLayer], "logz");
   }
 }
 
@@ -428,22 +426,27 @@ void DigitsTask::reset()
   ILOG(Debug, Devel) << "Resetting the histogram" << ENDM;
   mDigitsPerEvent->Reset();
   mDigitHCID->Reset();
+  mADCvalue->Reset();
+  mDigitsSizevsTrackletSize->Reset();
   mTotalPulseHeight2D->Reset();
   mPulseHeight->Reset();
-  mADCvalue->Reset();
+  mPulseHeightpro->Reset();
+  mPulseHeightperchamber->Reset();
+  for (auto& h : mPulseHeight2DperSM) {
+    h->Reset();
+  }
   for (auto& h : mHCMCM) {
-    h.get()->Reset();
+    h->Reset();
+  }
+  for (auto& h : mLayers) {
+    h->Reset();
   }
   if (mDoClusterize) {
     mNCls->Reset();
     mClsTb->Reset();
-    mClsChargeTb.get()->Reset();
-    mClsNTb.get()->Reset();
-    mClsAmp.get()->Reset();
+    mClsChargeTb->Reset();
+    mClsNTb->Reset();
+    mClsAmp->Reset();
   }
-  mPulseHeight.get()->Reset();
-  mTotalPulseHeight2D.get()->Reset();
-  mPulseHeightpro.get()->Reset();
-  mPulseHeightperchamber.get()->Reset();
 }
 } // namespace o2::quality_control_modules::trd