diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.cxx
index 6b5555b33f1e26866dddfad8621e3b6e61a23511..c5eb6e59f10bb46aed2ef8d11cfa73d0f95ed30d 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ////////////////////////////////////////////////////////////////////////////
@@ -16,10 +16,8 @@
 // Constructor with parameters:
 PixelDigitization::PixelDigitization(const std::string &name,
                                      ISvcLocator *pSvcLocator) :
-  AthAlgorithm(name,pSvcLocator),
-  m_pixelDigitizationTool("PixelDigitizationTool")
+  AthAlgorithm(name,pSvcLocator)
 {
-  declareProperty("DigitizationTool",        m_pixelDigitizationTool, "PixelDigitizationTool Name");
 }
 
 PixelDigitization::~PixelDigitization() { }
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.h b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.h
index 9d557b7db9e94676a86778932e981e1ad5f49a2a..33c98536842872974e323b951f49d5f3f29c5fee 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitization.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@
 #include "GaudiKernel/ToolHandle.h"
 
 #include "PileUpTools/PileUpToolBase.h"
-
+class PixelDigitizationTool;
 class PixelDigitization : public AthAlgorithm {
 
 public:
@@ -88,7 +88,7 @@ public:
   virtual StatusCode finalize();
 
 private:
-  ToolHandle<IPileUpTool> m_pixelDigitizationTool;
+  ToolHandle<PixelDigitizationTool> m_pixelDigitizationTool{this, "DigitizationTool", "PixelDigitizationTool", "PixelDigitizationTool name"};
 };
 	
 #endif // PIXELDIGITIZATION_PIXELDIGITIZATION_H
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx
index 19ccde868875605bdafa2d6b4732675f754943c2..c229cdb50865b6af90699ac19227e8f2edecb8e7 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx
@@ -34,9 +34,6 @@ PixelDigitizationTool::PixelDigitizationTool(const std::string &type,
   m_HardScatterSplittingMode(0),
   m_HardScatterSplittingSkipper(false),
   m_onlyHitElements(false),
-  m_chargeTool(nullptr),
-  m_fesimTool(nullptr),
-  m_energyDepositionTool(nullptr),
   m_detID(nullptr),
   m_vetoThisBarcode(crazyParticleBarcode),
   m_timedHits(nullptr),
@@ -45,9 +42,6 @@ PixelDigitizationTool::PixelDigitizationTool(const std::string &type,
   m_inputObjectName(""),
   m_createNoiseSDO(false)
 {
-  declareProperty("ChargeTools",      m_chargeTool,      "List of charge tools");
-  declareProperty("FrontEndSimTools", m_fesimTool,       "List of Front-End simulation tools");
-  declareProperty("EnergyDepositionTool",   m_energyDepositionTool,       "Energy deposition tool");
   declareProperty("MergeSvc",         m_mergeSvc,        "Merge service used in Pixel digitization");
   declareProperty("InputObjectName",  m_inputObjectName, "Input Object name" );
   declareProperty("CreateNoiseSDO",   m_createNoiseSDO,  "Set create noise SDO flag");
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h
index 894b5fdaaba14b01b9bd2303101a9fb4b9b0b645..6ba4f2d88a93e8e50f73f6fd70fabe50f793ace2 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h
@@ -67,16 +67,16 @@ class PixelDigitizationTool : public PileUpToolBase {
 
     bool              m_onlyHitElements;
 
-    ToolHandleArray<SensorSimTool>                 m_chargeTool;
-    ToolHandleArray<FrontEndSimTool>               m_fesimTool;
-    ToolHandle<EnergyDepositionTool>               m_energyDepositionTool;
-
     const PixelID            *m_detID;
 
     IntegerProperty           m_vetoThisBarcode;
 
     TimedHitCollection<SiHit> *m_timedHits;
 
+    ToolHandleArray<SensorSimTool> m_chargeTool{this, "ChargeTools", {}, "List of charge tools"};
+    ToolHandleArray<FrontEndSimTool> m_fesimTool{this, "FrontEndSimTools", {}, "List of Front-End simulation tools"};
+    ToolHandle<EnergyDepositionTool> m_energyDepositionTool{this, "EnergyDepositionTool", "EnergyDepositionTool", "Energy deposition tool"};
+
   protected:
 
     ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""};  //!< Random number service
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 95c39de00b08dff25e91b54822e0361ccf56681e..d795f8d7d0114306fcd2f31170e551316c5da0bc 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -24,5 +24,5 @@ ciRefFileMap = {
                 's3126-22.0'           : 'v3',
                 # OverlayTier0Test_required-test
                 'overlay-d1498-21.0'   : 'v1',
-                'overlay-d1498-22.0'   : 'v9',
+                'overlay-d1498-22.0'   : 'v10',
                }