diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 11ee3e1..2b6d2e5 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -47,7 +47,7 @@ jobs:
         docker run --name $container_name -d ${{ steps.build.outputs.image }}
         docker run -i --rm --link $container_name:$container_name buildpack-deps:curl \
           curl -fsSL http://$container_name:8080/ \
-          |grep '<span class=\"version\">'${{ steps.build.outputs.version }}
+          |grep -Pz '<span class="version">\n${{ steps.build.outputs.version }}'
       env:
         container_name: adminer_version
     - name: Verify that no warnings appear.
diff --git a/4/Dockerfile b/4/Dockerfile
index ca5fe81..53f116b 100644
--- a/4/Dockerfile
+++ b/4/Dockerfile
@@ -40,9 +40,9 @@ RUN	set -x \
 
 COPY	*.php /var/www/html/
 
-ENV	ADMINER_VERSION=4.8.1
-ENV	ADMINER_DOWNLOAD_SHA256=2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
-ENV	ADMINER_SRC_DOWNLOAD_SHA256=ef832414296d11eed33e9d85fff3fb316c63f13f05fceb4a961cbe4cb2ae8712
+ENV	ADMINER_VERSION=4.16.0
+ENV	ADMINER_DOWNLOAD_SHA256=f2596b1f110af2dff35c9a55b799bca16a160e6b482ab81b4bbf1378f5b4463f
+ENV	ADMINER_SRC_DOWNLOAD_SHA256=77113a436349faa0229325d450c3cb00442bab6fc00a3008772ec78bb42aef93
 
 RUN	set -x \
 &&	curl -fsSL https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -o adminer.php \
diff --git a/4/fastcgi/Dockerfile b/4/fastcgi/Dockerfile
index 67f5d0d..e623965 100644
--- a/4/fastcgi/Dockerfile
+++ b/4/fastcgi/Dockerfile
@@ -36,9 +36,9 @@ RUN	set -x \
 
 COPY	*.php /var/www/html/
 
-ENV	ADMINER_VERSION=4.8.1
-ENV	ADMINER_DOWNLOAD_SHA256=2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
-ENV	ADMINER_SRC_DOWNLOAD_SHA256=ef832414296d11eed33e9d85fff3fb316c63f13f05fceb4a961cbe4cb2ae8712
+ENV	ADMINER_VERSION=4.16.0
+ENV	ADMINER_DOWNLOAD_SHA256=f2596b1f110af2dff35c9a55b799bca16a160e6b482ab81b4bbf1378f5b4463f
+ENV	ADMINER_SRC_DOWNLOAD_SHA256=77113a436349faa0229325d450c3cb00442bab6fc00a3008772ec78bb42aef93
 
 RUN	set -x \
 &&	curl -fsSL https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -o adminer.php \