diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index f54f126e..3b5a5c1f 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -11,7 +11,6 @@ ndk_paths = {
     'r18b': "/home/vagrant/android-ndk/r18b",
     'r19c': "/home/vagrant/android-ndk/r19c",
     'r20b': "/home/vagrant/android-ndk/r20b",
-    'r21': "/home/vagrant/android-ndk/r21",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-amd64",
diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 44498dd7..1836e2cb 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -15,7 +15,7 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
-for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21; do
+for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b; do
     if [ ! -e ${NDK_BASE}/${version} ]; then
         unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
         mv android-ndk-${version} ${version}
diff --git a/examples/config.py b/examples/config.py
index 1ed0de51..17903dd0 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -22,7 +22,6 @@
 #     'r18b': None,
 #     'r19c': None,
 #     'r20b': None,
-#     'r21': None,
 # }
 
 # Directory to store downloaded tools in (i.e. gradle versions)
diff --git a/makebuildserver b/makebuildserver
index c962c6b7..b4cf56c1 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -384,8 +384,6 @@ CACHE_FILES = [
      '4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'),
     ('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip',
      '8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
-    ('https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip',
-     'b65ea2d5c5b68fb603626adcbcea6e4d12c68eb8a73e373bbb9d23c252fc647b'),
 ]