diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index bb93e77..5e7bb9c 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -17,8 +17,8 @@ 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 16b
-ENV ANDROID_NDK_API 16
+ENV ANDROID_NDK_REVISION 21d
+ENV ANDROID_NDK_API 19
 RUN mkdir -p /build && \
     cd /build && \
     curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
diff --git a/android-arm/Toolchain.cmake b/android-arm/Toolchain.cmake
index 0d11f7c..eb29934 100644
--- a/android-arm/Toolchain.cmake
+++ b/android-arm/Toolchain.cmake
@@ -1,14 +1,18 @@
 set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
 
 set(cross_triple arm-linux-androideabi)
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
-set(CMAKE_ANDROID_ARM_MODE 1)
-set(CMAKE_ANDROID_ARM_NEON 1)
+set(CMAKE_ANDROID_ARM_MODE ON)
+set(CMAKE_ANDROID_ARM_NEON ON)
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
 set(CMAKE_Fortran_COMPILER $ENV{FC})
+# Link to android logger
+set(CMAKE_EXE_LINKER_FLAGS "-llog")
+set(CMAKE_SHARED_LINKER_FLAGS "-llog")
 
 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
diff --git a/android-arm64/Dockerfile b/android-arm64/Dockerfile
index 9a10118..fcd5eba 100644
--- a/android-arm64/Dockerfile
+++ b/android-arm64/Dockerfile
@@ -21,7 +21,7 @@ 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 16b
+ENV ANDROID_NDK_REVISION 21d
 ENV ANDROID_NDK_API 21
 RUN mkdir -p /build && \
     cd /build && \
diff --git a/android-arm64/Toolchain.cmake b/android-arm64/Toolchain.cmake
index b06a843..0a55858 100644
--- a/android-arm64/Toolchain.cmake
+++ b/android-arm64/Toolchain.cmake
@@ -1,14 +1,17 @@
 set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
 
 set(cross_triple aarch64-linux-android)
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
-set(CMAKE_ANDROID_ARM_MODE 1)
-set(CMAKE_ANDROID_ARM_NEON 1)
+set(CMAKE_ANDROID_ARM_MODE ON)
+set(CMAKE_ANDROID_ARM_NEON ON)
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
 set(CMAKE_Fortran_COMPILER $ENV{FC})
+set(CMAKE_EXE_LINKER_FLAGS "-llog")
+set(CMAKE_SHARED_LINKER_FLAGS "-llog")
 
 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -17,4 +20,3 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)
 
 set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
-