diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 8a0e8b67..09fed05d 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", "r23b"]
+    args: ["/opt/android-sdk/ndk", "r23b"]
   config.vm.provision "shell", name: "gradle", path: "provision-gradle"
   config.vm.provision "shell", name: "disable-analytics", path: "provision-disable-analytics"
   config.vm.provision "shell", name: "buildserverid", path: "provision-buildserverid",
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 403bb74d..3c4eeb2d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -4341,8 +4341,9 @@ def _install_ndk(ndk):
         os.path.basename(url)
     )
     net.download_file(url, zipball)
-    if sha256 != sha256sum(zipball):
-        raise FDroidException('SHA-256 %s does not match expected for %s' % (sha256, url))
+    calced = sha256sum(zipball)
+    if sha256 != calced:
+        raise FDroidException('SHA-256 %s does not match expected for %s (%s)' % (calced, url, sha256))
     logging.info(_('Unzipping to %s') % ndk_base)
     with zipfile.ZipFile(zipball) as zipfp:
         for info in zipfp.infolist():
diff --git a/makebuildserver b/makebuildserver
index b373383a..1c419872 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -302,8 +302,6 @@ CACHE_FILES = [
      '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'),
     ('https://services.gradle.org/distributions/gradle-7.0.2-bin.zip',
      '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'),
-    ('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip',
-     'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e'),
     ('https://dl.google.com/android/repository/android-ndk-r23b-linux.zip',
      'c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382'),
 ]