diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index dbecc1c4cf52efe7dc1e804d68a4ea6bd6f1289a..06ede204c0834d8eb1d62590269965ddb16e5cee 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.69
+AnalysisBaseExternalsVersion = 2.0.70
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index c5635ff6b2f3803e1dc589507f94c88555a4d03c..b7f3b614e5364e3d68bbb9005c021efcd067a17d 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.69
+AtlasExternalsVersion = 2.0.70
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index a7149c426e5a7431e16b3343aefe0466a6cbc4ce..89f6d7054b37d4fed56676844f3d8c8edb5a74e8 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.69
+AthGenerationExternalsVersion = 2.0.70
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v33r1.004
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 81840116e1a52121c04a490ce3ac52a9ce0f0283..3cf9a994d107c3f6f9182969c5fa0f13a98d9267 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.69
+AthSimulationExternalsVersion = 2.0.70
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v33r1.004
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index e3e3a41a5fa55672a4ccf509aaab1cb72af59141..d2894d549dad4bb80d6770660abc3ed6f59b4b82 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.69
+AthenaExternalsVersion = 2.0.70
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v33r1.004
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 254dc48e8f9e72d0be5d46b6013cdb1745ac58ee..71b7e6156520ef0bbf4b6dbd5bd585fae4ce3e37 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.68
+VP1LightExternalsVersion = 2.0.70
diff --git a/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx b/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
index 3efd705c4e61e6e64b3e091458bd745f2d52dfbb..7ecd32bcf8265761a9f381b244aefde9078995a7 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
@@ -31,7 +31,7 @@
 #include <string>
 
 //TEST
-#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/NeutralTrackParameters.hpp"
 #include "Acts/Propagator/ActionList.hpp"
 #include "Acts/Propagator/DebugOutputActor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
diff --git a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
index b1755eb834742366c39d45e8d086cae7342e692c..d7838e872097a61cc2e8c8143cb6c43791923b6e 100644
--- a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
+++ b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
@@ -109,7 +109,7 @@ private:
   using Propagator = Acts::Propagator<Acts::EigenStepper<ATLASMagneticFieldWrapper>, Acts::Navigator>;
   using TrackLinearizer = Acts::HelicalTrackLinearizer<Propagator>;
   using VertexFitter = Acts::AdaptiveMultiVertexFitter<TrackWrapper, TrackLinearizer>;
-  using VertexSeedFinder = Acts::TrackDensityVertexFinder<VertexFitter, Acts::GaussianTrackDensity>;
+  using VertexSeedFinder = Acts::TrackDensityVertexFinder<VertexFitter, Acts::GaussianTrackDensity<TrackWrapper>>;
   using VertexFinder = Acts::AdaptiveMultiVertexFinder<VertexFitter, VertexSeedFinder>;
 
   std::shared_ptr<VertexFinder> m_vertexFinder = nullptr;
diff --git a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
index 2ca64719ffa7f3b9ec84ea3f8a475cb17fd68f5f..bb9e415308077aff314cb582bed988ba34f849fb 100755
--- a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
+++ b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
@@ -100,14 +100,14 @@ ActsAdaptiveMultiPriVtxFinderTool::initialize()
     TrackLinearizer linearizer(ltConfig);
 
     // Set up Gaussian track density
-    Acts::GaussianTrackDensity::Config trackDensityConfig;
+    Acts::GaussianTrackDensity<TrackWrapper>::Config trackDensityConfig;
     trackDensityConfig.d0MaxSignificance = m_gaussianMaxD0Significance;
     trackDensityConfig.z0MaxSignificance = m_gaussianMaxZ0Significance;
-    Acts::GaussianTrackDensity trackDensity(trackDensityConfig);
+    Acts::GaussianTrackDensity<TrackWrapper> trackDensity(trackDensityConfig);
 
     // Vertex seed finder
     VertexSeedFinder::Config seedFinderConfig;
-    seedFinderConfig.trackDensityEstimator = trackDensity;
+    //seedFinderConfig.trackDensityEstimator = trackDensity;
     VertexSeedFinder seedFinder(seedFinderConfig, extractParameters);
     VertexFinder::Config finderConfig(std::move(fitter), seedFinder,
       ipEst, linearizer);
@@ -301,12 +301,7 @@ ActsAdaptiveMultiPriVtxFinderTool::findVertex(const EventContext& ctx, std::vect
       xAODVtx->makePrivateStore();
       xAODVtx->setPosition(vtx.position());
       xAODVtx->setCovariancePosition(vtx.covariance());
-      // TODO: remove this 1.e9 subtraction once acts bug fix is in.
-      double tempChi2 = vtx.fitQuality().first;
-      if(tempChi2 >= 1.e9){
-        tempChi2 -= 1.e9;
-      }
-      xAODVtx->setFitQuality(tempChi2, vtx.fitQuality().second);
+      xAODVtx->setFitQuality(vtx.fitQuality().first, vtx.fitQuality().second);
 
       const auto& tracks = vtx.tracks();
       std::vector<Trk::VxTrackAtVertex>* trkAtVtxVec = &(xAODVtx->vxTrackAtVertex());