diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
index 6cf8f5fb90a0174350113a7e81a5ec6f8d440f5e..90c22458bf000965bd4521fd3187b17deaaf63b0 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinder.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
@@ -162,8 +162,7 @@ InitStatus CbmMvdClusterfinder::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-
-  // Add the digitizer plugin to all sensors
+  // Add the cluster finder plugin to all sensors
   std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
   UInt_t plugincount=fDetector->GetPluginCount();
 
@@ -172,7 +171,7 @@ InitStatus CbmMvdClusterfinder::Init()
     CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
 
     itr->second->AddPlugin(clusterTask);
-    itr->second->SetDigiPlugin(plugincount);
+    itr->second->SetClusterPlugin(plugincount);
   }
   fDetector->SetSensorArrayFilled(kTRUE);
   fDetector->SetPluginCount(plugincount+1);
diff --git a/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
index b38a693237e191989e48daf643fc5be219d4aca3..cdfbec700c3aac081534bf2aa84c591bfa536a87 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
@@ -145,14 +145,24 @@ InitStatus CbmMvdClusterfinderTB::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-  CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
+  // Add the cluster finder plugin to all sensors
+  std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
+  UInt_t plugincount=fDetector->GetPluginCount();
 
-  fDetector->AddPlugin(clusterTask);
+  for (auto itr = sensorMap.begin();
+              itr != sensorMap.end(); itr++) {
+    CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
+
+    itr->second->AddPlugin(clusterTask);
+    itr->second->SetClusterPlugin(plugincount);
+  }
+  fDetector->SetSensorArrayFilled(kTRUE);
+  fDetector->SetPluginCount(plugincount+1);
   fClusterPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
+
   if (fShowDebugHistos) fDetector->ShowDebugHistos();
   fDetector->Init();
 
-
   // Screen output
   LOG(info) << GetName() << " initialised";
 
diff --git a/reco/detectors/mvd/CbmMvdDigiToHit.cxx b/reco/detectors/mvd/CbmMvdDigiToHit.cxx
index 955ca07e9d90b1d2184575afabe4e18eba8f585c..0f1407799a4941896032980b46404afe6ea94219 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHit.cxx
+++ b/reco/detectors/mvd/CbmMvdDigiToHit.cxx
@@ -149,7 +149,7 @@ InitStatus CbmMvdDigiToHit::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-  // Add the digitizer plugin to all sensors
+  // Add the digi2hit plugin to all sensors
   std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
   UInt_t plugincount=fDetector->GetPluginCount();
 
@@ -158,7 +158,7 @@ InitStatus CbmMvdDigiToHit::Init()
     CbmMvdSensorDigiToHitTask* hitTask = new CbmMvdSensorDigiToHitTask();
 
     itr->second->AddPlugin(hitTask);
-    itr->second->SetDigiPlugin(plugincount);
+    itr->second->SetHitPlugin(plugincount);
   }
   fDetector->SetSensorArrayFilled(kTRUE);
   fDetector->SetPluginCount(plugincount+1);
diff --git a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
index ae289816b88e5bcc536cb0dfb0f03c6a7bf4fca2..e756b86277e613e1450ca684204cd801beaa1fa0 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
+++ b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
@@ -141,10 +141,21 @@ InitStatus CbmMvdDigiToHitTB::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-  CbmMvdSensorDigiToHitTask* clusterTask = new CbmMvdSensorDigiToHitTask();
+  // Add the digi2hit plugin to all sensors
+  std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
+  UInt_t plugincount=fDetector->GetPluginCount();
+
+  for (auto itr = sensorMap.begin();
+              itr != sensorMap.end(); itr++) {
+    CbmMvdSensorDigiToHitTask* hitTask = new CbmMvdSensorDigiToHitTask();
+
+    itr->second->AddPlugin(hitTask);
+    itr->second->SetHitPlugin(plugincount);
+  }
+  fDetector->SetSensorArrayFilled(kTRUE);
+  fDetector->SetPluginCount(plugincount+1);
+  fHitPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
 
-  fDetector->AddPlugin(clusterTask);
-  fClusterPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
   if (fShowDebugHistos) fDetector->ShowDebugHistos();
   fDetector->Init();
 
diff --git a/reco/detectors/mvd/CbmMvdHitfinder.cxx b/reco/detectors/mvd/CbmMvdHitfinder.cxx
index 6575309b66d790263289d571bdda7ca3a203d69e..626773fc1830cbb318c72bf4a6940e64cc996089 100644
--- a/reco/detectors/mvd/CbmMvdHitfinder.cxx
+++ b/reco/detectors/mvd/CbmMvdHitfinder.cxx
@@ -208,7 +208,7 @@ InitStatus CbmMvdHitfinder::Init()
   fDetector = CbmMvdDetector::Instance();
 
 
-  // Add the digitizer plugin to all sensors
+  // Add the hit finder plugin to all sensors
   std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
   UInt_t plugincount=fDetector->GetPluginCount();
 
@@ -217,7 +217,7 @@ InitStatus CbmMvdHitfinder::Init()
     CbmMvdSensorHitfinderTask* hitfinderTask = new CbmMvdSensorHitfinderTask();
 
     itr->second->AddPlugin(hitfinderTask);
-    itr->second->SetDigiPlugin(plugincount);
+    itr->second->SetHitPlugin(plugincount);
   }
   fDetector->SetSensorArrayFilled(kTRUE);
   fDetector->SetPluginCount(plugincount+1);
diff --git a/reco/detectors/mvd/CbmMvdHitfinderTB.cxx b/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
index 1a85a987a90ff95e72c2b2cb84ef909ff31f3ed7..9802db40101f233f0a121edf250931f5198a6215 100644
--- a/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
+++ b/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
@@ -153,10 +153,23 @@ InitStatus CbmMvdHitfinderTB::Init()
 
   fDetector = CbmMvdDetector::Instance();
 
-  CbmMvdSensorHitfinderTask* HitfinderTask = new CbmMvdSensorHitfinderTask();
-  fDetector->AddPlugin(HitfinderTask);
 
+
+  // Add the hit finder plugin to all sensors
+  std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
+  UInt_t plugincount=fDetector->GetPluginCount();
+
+  for (auto itr = sensorMap.begin();
+              itr != sensorMap.end(); itr++) {
+    CbmMvdSensorHitfinderTask* hitfinderTask = new CbmMvdSensorHitfinderTask();
+
+    itr->second->AddPlugin(hitfinderTask);
+    itr->second->SetHitPlugin(plugincount);
+  }
+  fDetector->SetSensorArrayFilled(kTRUE);
+  fDetector->SetPluginCount(plugincount+1);
   fHitfinderPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
+
   if (fShowDebugHistos) fDetector->ShowDebugHistos();
   fDetector->Init();