diff --git a/Simulation/G4Atlas/G4AtlasTools/python/G4FieldConfig.py b/Simulation/G4Atlas/G4AtlasTools/python/G4FieldConfig.py
index 429aca4467a22a3f0962f66f265673542da21307..171c14c872cdcf72db0d8e754db38e1b41047475 100644
--- a/Simulation/G4Atlas/G4AtlasTools/python/G4FieldConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTools/python/G4FieldConfig.py
@@ -93,8 +93,8 @@ def MuonsOnlyInCaloFieldManagerToolCfg(flags, name='MuonsOnlyInCaloFieldManager'
     #kwargs.setdefault('DeltaChord',         0.00000002)
     kwargs.setdefault('DeltaIntersection',  0.00000002)
     kwargs.setdefault('DeltaOneStep',       0.000001)
-    kwargs.setdefault('MaximumEpsilonStep', 0.0000009)
-    kwargs.setdefault('MinimumEpsilonStep', 0.000001)
+    kwargs.setdefault('MaximumEpsilonStep', 0.000001)
+    kwargs.setdefault('MinimumEpsilonStep', 0.0000009)
     kwargs.setdefault('MuonOnlyField',      True)
     return BasicDetectorFieldManagerToolCfg(flags, name, **kwargs)
 
@@ -103,8 +103,8 @@ def MuonFieldManagerToolCfg(flags, name='MuonFieldManager', **kwargs):
     #kwargs.setdefault('DeltaChord',         0.00000002)
     kwargs.setdefault('DeltaIntersection',  0.00000002)
     kwargs.setdefault('DeltaOneStep',       0.000001)
-    kwargs.setdefault('MaximumEpsilonStep', 0.0000009)
-    kwargs.setdefault('MinimumEpsilonStep', 0.000001)
+    kwargs.setdefault('MaximumEpsilonStep', 0.000001)
+    kwargs.setdefault('MinimumEpsilonStep', 0.0000009)
     return BasicDetectorFieldManagerToolCfg(flags, name, **kwargs)
 
 
diff --git a/Tools/PROCTools/data/q447_AOD_digest.ref b/Tools/PROCTools/data/q447_AOD_digest.ref
index 3079e57c689d810b312d1a6eca6cdb304de184ce..2e79973e7f13465c3b435023c134043bd55ecceb 100644
--- a/Tools/PROCTools/data/q447_AOD_digest.ref
+++ b/Tools/PROCTools/data/q447_AOD_digest.ref
@@ -1,6 +1,6 @@
          run       event       nTopo   nIdTracks  nTauTracks       nTaus      nMuons       nElec   nTrueElec   nFakeElec       nPhot   nTruePhot   nFakePhot
-      242000     3120001         219           9           2           1           1           0           0           0           0           0           0
+      242000     3120001         236           8           3           1           1           0           0           0           0           0           0
       242000     3120002         169           7           0           0           1           0           0           0           0           0           0
-      242000     3120003         343          36           7           3           2           1           0           1           4           0           4
-      242000     3120004         172          13           4           1           0           0           0           0           0           0           0
-      242000     3120005         390          31           4           2           3           3           1           2           2           0           2
+      242000     3120003         366          35           5           3           2           3           0           3           2           1           1
+      242000     3120004         179          10           5           1           0           0           0           0           0           0           0
+      242000     3120005         358          34           5           1           3           0           0           0           2           0           2
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index c0a71f9800240b082baec94472f111cf7eba7564..6bfffd4d9367822d0ca3f18d97243158a9594814 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -11,12 +11,12 @@
 # Format is "test" : "version"
 references_map = {
     # Simulation
-    "s3761": "v16",
-    "s4005": "v10",
-    "s4006": "v18",
-    "s4007": "v17",
+    "s3761": "v17",
+    "s4005": "v11",
+    "s4006": "v19",
+    "s4007": "v18",
     "s4008": "v1",
-    "a913": "v12",
+    "a913": "v13",
     # Digi
     "d1920": "v5",
     # Overlay