diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in
index 43b8844..45a1357 100644
--- a/android-arm/Dockerfile.in
+++ b/android-arm/Dockerfile.in
@@ -17,12 +17,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 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..b4dffb6 100644
--- a/android-arm64/Dockerfile.in
+++ b/android-arm64/Dockerfile.in
@@ -21,12 +21,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 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..42a9e8d 100644
--- a/android-x86/Dockerfile
+++ b/android-x86/Dockerfile
@@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 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..41236a6 100644
--- a/android-x86_64/Dockerfile
+++ b/android-x86_64/Dockerfile
@@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 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 \