diff --git a/Rec/RecConf/python/RecConf/Configuration.py b/Rec/RecConf/python/RecConf/Configuration.py
index 2343743677cff49d3f35d976669ef3d621d79167..57816ca36e5b0cfffe8ea316373f17ff56f45a91 100755
--- a/Rec/RecConf/python/RecConf/Configuration.py
+++ b/Rec/RecConf/python/RecConf/Configuration.py
@@ -79,7 +79,7 @@ class RecSysConf(LHCbConfigurableUser):
             self.setProp("RecoSequence",self.DefaultSubDetsFieldOn)
             if self.getProp("DataType") in self.Run2DataTypes:
                 self.setProp("RecoSequence",self.DefaultSubDetsFieldOnRun2)
-            if self.getProp("DataType") == "Upgrade":
+            if self.getProp("DataType").startswith("Upgrade"):
                 trackConf = TrackSys()
                 trSeq = trackConf.getProp("TrackingSequence")
                 if trSeq != []:
@@ -100,9 +100,8 @@ class RecSysConf(LHCbConfigurableUser):
         from Configurables import ProcessPhase
         ProcessPhase("Reco").DetectorList += recoSeq
 
-        Run2UpgradeDataTypes = self.Run2DataTypes+["Upgrade"]
         # Primary Vertex and V0 finding
-        if "Vertex" in recoSeq  and self.getProp("DataType") not in (Run2UpgradeDataTypes):
+        if "Vertex" in recoSeq  and self.getProp("DataType") not in self.Run2DataTypes and not self.getProp("DataType").startswith("Upgrade"):
             from Configurables import PatPVOffline, TrackV0Finder
             pvAlg = PatPVOffline()
             if "2009" == self.getProp("DataType"):
@@ -181,7 +180,7 @@ class RecSysConf(LHCbConfigurableUser):
             GaudiSequencer("RecoVertexSeq").IgnoreFilterPassed = True
 
         ## Upgrade type?
-        if self.getProp("DataType") == 'Upgrade' :
+        if self.getProp("DataType").startswith('Upgrade'):
              specialDataList = self.getProp("SpecialData")
              specialDataList.append("upgrade")
              self.setProp("SpecialData",specialDataList)
diff --git a/Tf/TrackSys/python/TrackSys/Configuration.py b/Tf/TrackSys/python/TrackSys/Configuration.py
index 248c10ffaba90a9027152b06a1bbc459bbac1d80..68f5e5b9995b635943f25fe6e8d00b41c4efcc96 100755
--- a/Tf/TrackSys/python/TrackSys/Configuration.py
+++ b/Tf/TrackSys/python/TrackSys/Configuration.py
@@ -124,7 +124,7 @@ class TrackSys(LHCbConfigurableUser):
               log.warning("Using non-default pat reco algorithm: '%s'" %algo)
               log.warning("Default pat reco algorithms are: %s" %self.AvailablePatRecoAlgos)
 
-      if len(self.getProp("TrackingSequence")) == 0 and self.getProp("DataType")=="Upgrade":
+      if len(self.getProp("TrackingSequence")) == 0 and self.getProp("DataType").startswith("Upgrade"):
           self.setProp("TrackingSequence",["TrFast","TrBest"])
 
       if "cosmics" not in self.getProp("SpecialData"):