diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEFCaloCalibFexConfig.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEFCaloCalibFexConfig.py
index 831316da203d7caaaa1a0f65b425fb545c1765d0..d3491d181dc22f8479e55e9c3f9c30c6ffe4f72e 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEFCaloCalibFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEFCaloCalibFexConfig.py
@@ -12,9 +12,7 @@ from AthenaCommon.SystemOfUnits import GeV, mm
 from AthenaCommon.AppMgr import ToolSvc
 from egammaRec.Factories import Factory, ToolFactory
 
-from egammaTools.egammaToolsFactories import egammaMVATool
-TrigEgammaMVACalibTool =  egammaMVATool.copy(name="TrigEgammaMVACalibTool",folder="egammaMVACalib/online/v3",use_layer_corrected = False)
-
+from TrigEgammaRec.TrigEgammaToolFactories import TrigEgammaMVACalibTool
 def configureTrigEFCaloCalibFexMonitoring(tool):
     
     from TrigEgammaHypo.TrigEFCaloHypoMonitoring import TrigEFCaloCalibFexValidationMonitoring, TrigEFCaloCalibFexOnlineMonitoring
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py
index 075f9710ef1a9d815654877ee2bcfa5a9255c0a9..56f691c7f89978e840cc96a4102af89d7090fc7c 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py
@@ -13,12 +13,17 @@
 # Release 21 Update
 # Remove Run1 selectors
 # Remove unused selectors
+# 21.0.12 -- Use TrigEgammaFlags to control version
+# Future plans:
+# Move all tools into TrigEgammaRec 
+# Ensure consistent initialize of Pid Tools in menu or in ToolFactories
+
 from PATCore.HelperUtils import *
 from AthenaCommon import CfgMgr
 
 import sys
 import cppyy
-
+import logging
 cppyy.loadDictionary('ElectronPhotonSelectorToolsDict')
 from ROOT import LikeEnum
 from ROOT import egammaPID
@@ -33,8 +38,11 @@ from ElectronPhotonSelectorTools.ConfiguredAsgPhotonIsEMSelectors import Configu
 from ElectronPhotonSelectorTools.TrigEGammaPIDdefs import SelectionDefElectron
 from ElectronPhotonSelectorTools.TrigEGammaPIDdefs import SelectionDefPhoton
 
+mlog = logging.getLogger ('TrigEgammaPidTools')
 # Path for versioned configuration
-ConfigFilePath = "ElectronPhotonSelectorTools/trigger/rel21_20161021/"
+from TrigEgammaRec.TrigEgammaFlags import jobproperties
+mlog.info("TrigEgammaPidTools version %s"%jobproperties.TrigEgammaFlags.pidVersion())
+ConfigFilePath = jobproperties.TrigEgammaFlags.pidVersion() 
 
 # Dictionaries for ToolNames
 ElectronToolName = {'vloose':'AsgElectronIsEMVLooseSelector',
@@ -225,4 +233,4 @@ def PhotonPidTools():
         tool.isEMMask = PhotonIsEMBits[key]
         tool.ForceConvertedPhotonPID = True
         addToToolSvc( tool )
-
+del mlog