diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in
index 43b8844..a3da819 100644
--- a/android-arm/Dockerfile.in
+++ b/android-arm/Dockerfile.in
@@ -21,8 +21,8 @@ ENV ANDROID_NDK_REVISION 22b
 ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm \
diff --git a/android-arm64/Dockerfile.in b/android-arm64/Dockerfile.in
index 1c0dee6..1701d11 100644
--- a/android-arm64/Dockerfile.in
+++ b/android-arm64/Dockerfile.in
@@ -25,8 +25,8 @@ ENV ANDROID_NDK_REVISION 22b
 ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm64 \
diff --git a/android-x86/Dockerfile b/android-x86/Dockerfile
index 148b7da..9021080 100644
--- a/android-x86/Dockerfile
+++ b/android-x86/Dockerfile
@@ -16,8 +16,8 @@ ENV ANDROID_NDK_REVISION 22b
 ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch x86 \
diff --git a/android-x86_64/Dockerfile b/android-x86_64/Dockerfile
index 9f6609d..a22359d 100644
--- a/android-x86_64/Dockerfile
+++ b/android-x86_64/Dockerfile
@@ -16,8 +16,8 @@ ENV ANDROID_NDK_REVISION 22b
 ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch x86_64 \