diff --git a/builds/android/Dockerfile b/builds/android/Dockerfile
index 336bbca7..1a6a88d3 100644
--- a/builds/android/Dockerfile
+++ b/builds/android/Dockerfile
@@ -1,22 +1,63 @@
-FROM ubuntu:14.04
-MAINTAINER Benjamin Henrion <zoobab@gmail.com>
- 
-RUN DEBIAN_FRONTEND=noninteractive apt-get update -y -q
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes tar git curl nano wget dialog net-tools build-essential vim emacs apt-utils file uuid-dev cmake asciidoc python autoconf automake libtool pkg-config xmlto sudo gettext apt-utils
+# FROM		debian:7       # APT repo no more available.
+# FROM		debian:8
+# FROM		debian:9
+# FROM		debian:10
+# FROM		debian:11
 
-RUN useradd -d /home/zmq -m -s /bin/bash zmq
-RUN echo "zmq ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/zmq
-RUN chmod 0440 /etc/sudoers.d/zmq
+# FROM		ubuntu:12.04   # APT repo no more available.
+# FROM		ubuntu:14.04
+# FROM		ubuntu:16.04
+# FROM		ubuntu:18.04
+# FROM		ubuntu:20.04
+FROM		ubuntu:22.04
+
+ENV		DEBIAN_FRONTEND=noninteractive
+
+RUN		apt-get update -y -q
+
+RUN		apt-get install -y -q \
+			apt-utils
+
+RUN		apt-get install -y -q \
+			autoconf \
+			automake \
+			cmake \
+			file \
+			git \
+			libtool \
+			pkg-config \
+			unzip \
+			wget
+
+# Create user ZMQ, and run Android build with it.
+# This ensures that nothing weird is performed with
+# ROOT privileges.
+RUN		useradd -d /home/zmq -m -s /bin/bash zmq
+USER		zmq
+WORKDIR		/home/zmq
+
+# Install android NDK (up to NDK 22):
+# ENV		NDK_VERSION=android-ndk-r18  # Build failed to detect NDK tools (bug).
+# ENV		NDK_VERSION=android-ndk-r19  # Build passed
+# ENV		NDK_VERSION=android-ndk-r20  # Build passed
+# ENV		NDK_VERSION=android-ndk-r21  # Build passed
+# ENV		NDK_VERSION=android-ndk-r22  # Build passed
+
+# RUN		wget -q -O ndk_archive.zip http://dl.google.com/android/repository/${NDK_VERSION}-linux-x86_64.zip
+
+# Install android NDK (from NDK 23):
+# ENV		NDK_VERSION=android-ndk-r23  # Build passed
+# ENV		NDK_VERSION=android-ndk-r24  # Build passed
+ENV		NDK_VERSION=android-ndk-r25
+
+RUN		wget -q -O ndk_archive.zip http://dl.google.com/android/repository/${NDK_VERSION}-linux.zip
+
+RUN		unzip -q ndk_archive.zip
+
+# Clone and build LIBZMQ
+ENV		ANDROID_NDK_ROOT=/home/zmq/${NDK_VERSION}
+
+RUN		git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git
+
+RUN		libzmq/builds/android/ci_build.sh
 
-USER zmq
-# install android-ndk
-RUN cd ~ && wget -q http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O android-ndk-r10e-linux-x86_64.bin && chmod +x android-ndk-r10e-linux-x86_64.bin
-RUN cd ~ && ./android-ndk-r10e-linux-x86_64.bin
-ENV ANDROID_NDK_ROOT /home/zmq/android-ndk-r10e
-ENV TOOLCHAIN_NAME arm-linux-androideabi-4.9
-ENV TOOLCHAIN_HOST arm-linux-androideabi
-ENV TOOLCHAIN_PATH ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_NAME}/prebuilt/linux-x86_64/bin
-ENV TOOLCHAIN_ARCH arm
-# build libzmq for android
-RUN cd ~ && git clone --depth 1 https://github.com/zeromq/libzmq.git
-RUN cd ~/libzmq/builds/android && ./build.sh