diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 140e800a..02fadf8d 100644
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -84,7 +84,7 @@ Vagrant.configure("2") do |config|
     args: [configfile['debian_mirror']]
   config.vm.provision "shell", name: "android-sdk", path: "provision-android-sdk"
   config.vm.provision "shell", name: "android-ndk", path: "provision-android-ndk",
-    args: ["/opt/android-sdk/ndk", "r21e", "r22b"]
+    args: ["/opt/android-sdk/ndk", "r21e", "r23b"]
   config.vm.provision "shell", name: "gradle", path: "provision-gradle"
   config.vm.provision "shell", name: "buildserverid", path: "provision-buildserverid",
     args: [`git rev-parse HEAD`]
diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index ca2cc325..63f5eee7 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -15,7 +15,7 @@ cd $NDK_BASE
 
 for version in $@; do
     if [ ! -e ${NDK_BASE}/${version} ]; then
-        unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
+        unzip /vagrant/cache/android-ndk-${version}-linux*.zip > /dev/null
         mv android-ndk-${version} \
 	   `sed -En 's,^Pkg.Revision *= *(.+),\1,p' android-ndk-${version}/source.properties`
     fi
diff --git a/makebuildserver b/makebuildserver
index 24fe201a..b373383a 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -304,8 +304,8 @@ CACHE_FILES = [
      '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'),
     ('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip',
      'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e'),
-    ('https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip',
-     'ac3a0421e76f71dd330d0cd55f9d99b9ac864c4c034fc67e0d671d022d4e806b'),
+    ('https://dl.google.com/android/repository/android-ndk-r23b-linux.zip',
+     'c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382'),
 ]