diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index d3a941f4fcb1762a71087477a84ee89918254981..7d68682b44ec151285c13c06dee5823e3a290bc2 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.15.1
+AnalysisBaseExternalsVersion = 2.0.17
diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt
index 5d627a3ad9f4ab1afef237153123538c9dd9cd99..8dae2256cecb0081e9b22e07dbe8c45e6b38e11c 100644
--- a/Projects/AnalysisTop/externals.txt
+++ b/Projects/AnalysisTop/externals.txt
@@ -1,4 +1,4 @@
 # Versions of the various externals to build before starting the build of
 # this project, when doing a full stack nightly build.
 
-AnalysisBaseExternalsVersion = 2.0.15.1
+AnalysisBaseExternalsVersion = 2.0.17
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index dd2d05d250dcc9af4adaa02c85f4e3ffa7005824..ccb4bdedc50bfb08d9b72f7b69c660dbdc086f24 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.15.1
+AtlasExternalsVersion = 2.0.17
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index f5bcaa4b2550bb5aa4e4bbb3ec69e987115471a4..f3b864223fb8f426c611f1b766000330c60a2108 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.15.1
+AthSimulationExternalsVersion = 2.0.17
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v31r0.000
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index efbf77369ceef1e011b52bcb8fe9dd8266cd8c85..9683078b6b6d6deafdae6c3a0ac5232daaf91358 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -139,9 +139,9 @@ fi
 AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/externals.txt)
 
 # Check out AthenaExternals from the right branch/tag:
-#${scriptsdir}/checkout_atlasexternals.sh \
-#    -t ${AthenaExternalsVersion} \
-#    -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log 
+${scriptsdir}/checkout_atlasexternals.sh \
+    -t ${AthenaExternalsVersion} \
+    -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log 
 
 # log analyzer never affects return status in the parent shell:
 {
@@ -162,7 +162,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex
 ## Build AthenaExternals:
 export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AthenaExternals
 ${scriptsdir}/build_atlasexternals.sh \
-    -s /build1/tsulaia/athena-devel/atlasexternals/src \
+    -s ${BUILDDIR}/src/AthenaExternals \
     -b ${BUILDDIR}/build/AthenaExternals \
     -i ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION} \
     -p AthenaExternals ${RPMOPTIONS} -t ${BUILDTYPE} \
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 8c7b973bd3afedd92eb762f71f0299e57c4fa70e..53d70f431462892e2ede812af85cf0ed8ce69eb5 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.15.1
+AthenaExternalsVersion = 2.0.17
 
 # The version of atlas/Gaudi to use: 
 GaudiVersion = v31r0.000