diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py
index c80353bfc4f6508e5c541af78bd36d90ef6d6906..958bba24010dcd7a70a91df5adb93b5de80cee81 100644
--- a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py
+++ b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py
@@ -102,16 +102,36 @@ def FastSimNavigatorCfg(flags,
     result.setPrivateTools(CompFactory.Trk.Navigator(name, **kwargs))
     return result
 
+# Uses Highland formula for sigma
+# from Trk::MaterialInteraction::sigmaMS
+# (PDG 2018 formula 33.15)
+# = default config
+def AtlasMultipleScatteringUpdatorCfg(flags,
+                                      name="AtlasMultipleScatteringUpdator",
+                                      **kwargs):
+    acc = ComponentAccumulator()
+    kwargs.setdefault("UseTrkUtils", True)
+    acc.setPrivateTools(
+        CompFactory.Trk.MultipleScatteringUpdator(name, **kwargs))
+    return acc
 
-def MultipleScatteringUpdatorCfg(flags,
-                                 name="MultipleScatteringUpdator",
-                                 **kwargs):
+# Uses Highland formula for sigma
+# from Trk::MultipleScatteringUpdator::sigmaSquare
+# (PDG 2010 formula 27.14)
+# = non default config, used for GlobalChi2Fitter
+def InDetMultipleScatteringUpdatorCfg(flags,
+                                      name="InDetMultipleScatteringUpdator",
+                                      **kwargs):
     acc = ComponentAccumulator()
     kwargs.setdefault("UseTrkUtils", False)
     acc.setPrivateTools(
         CompFactory.Trk.MultipleScatteringUpdator(name, **kwargs))
     return acc
 
+def ITkMultipleScatteringUpdatorCfg(flags,
+                                    name="ITkMultipleScatteringUpdator",
+                                    **kwargs):
+    return InDetMultipleScatteringUpdatorCfg(flags, name, **kwargs)
 
 def fatrasMultipleScatteringUpdatorCfg(flags,
                                        name="ISF_FatrasMultipleScatteringUpdator",
diff --git a/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py b/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py
index 53e1afd8c4cc479709989fb1f4ba52099eaec093..dd9e02892e2f1d658f4721679112504be43b5217 100644
--- a/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py
+++ b/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py
@@ -37,7 +37,7 @@ def InDetGlobalChi2FitterBaseCfg(flags,
     from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
     from TrkConfig.AtlasExtrapolatorToolsConfig import (
         AtlasNavigatorCfg, AtlasEnergyLossUpdatorCfg,
-        InDetMaterialEffectsUpdatorCfg, MultipleScatteringUpdatorCfg)
+        InDetMaterialEffectsUpdatorCfg, InDetMultipleScatteringUpdatorCfg)
 
     InDetExtrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags))
     InDetNavigator = acc.popToolsAndMerge(
@@ -46,7 +46,7 @@ def InDetGlobalChi2FitterBaseCfg(flags,
     InDetMaterialEffectsUpdator = acc.popToolsAndMerge(
         InDetMaterialEffectsUpdatorCfg(flags))
     MultipleScatteringUpdator = acc.popToolsAndMerge(
-        MultipleScatteringUpdatorCfg(flags))
+        InDetMultipleScatteringUpdatorCfg(flags))
 
     from TrkConfig.TrkExRungeKuttaPropagatorConfig import InDetPropagatorCfg
     InDetPropagator = acc.popToolsAndMerge(InDetPropagatorCfg(flags))
@@ -450,7 +450,7 @@ def ITkGlobalChi2FitterBaseCfg(flags,
     from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
     from TrkConfig.AtlasExtrapolatorToolsConfig import (
         AtlasNavigatorCfg, AtlasEnergyLossUpdatorCfg,
-        ITkMaterialEffectsUpdatorCfg, MultipleScatteringUpdatorCfg)
+        ITkMaterialEffectsUpdatorCfg, ITkMultipleScatteringUpdatorCfg)
 
     Extrapolator = acc.popToolsAndMerge(AtlasExtrapolatorCfg(flags))
     Navigator = acc.popToolsAndMerge(AtlasNavigatorCfg(flags))
@@ -458,7 +458,7 @@ def ITkGlobalChi2FitterBaseCfg(flags,
     ITkMaterialEffectsUpdator = acc.popToolsAndMerge(
         ITkMaterialEffectsUpdatorCfg(flags))
     MultipleScatteringUpdator = acc.popToolsAndMerge(
-        MultipleScatteringUpdatorCfg(flags))
+        ITkMultipleScatteringUpdatorCfg(flags))
 
     from TrkConfig.TrkExRungeKuttaPropagatorConfig import ITkPropagatorCfg
     ITkPropagator = acc.popToolsAndMerge(ITkPropagatorCfg(flags))