diff --git a/.github/workflows/publish.8.yml b/.github/workflows/publish.8.yml
index 315ed37..159a6d9 100644
--- a/.github/workflows/publish.8.yml
+++ b/.github/workflows/publish.8.yml
@@ -13,7 +13,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }}
     strategy:
       matrix:
-        version: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        version: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         flavor: [ '', '-apache', '-fpm', '-alpine', '-fpm-alpine' ]
         include:
           - version: 'latest'
diff --git a/.github/workflows/test.8.yml b/.github/workflows/test.8.yml
index 2c9e94a..213510e 100644
--- a/.github/workflows/test.8.yml
+++ b/.github/workflows/test.8.yml
@@ -16,7 +16,7 @@ jobs:
     if: ${{ !contains(github.event.commits[0].message, '[skip ci]') && !contains(github.event.commits[0].message, '[ci skip]') }}
     strategy:
       matrix:
-        version: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        version: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         flavor: [ '', '-apache', '-fpm', '-alpine', '-fpm-alpine' ]
         include:
           - version: 'latest'
diff --git a/Makefile b/Makefile
index b350bc9..725a58e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,11 +33,11 @@ EXTENSIONS := \
 	xsl \
 	zip \
 	sockets
-ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to PHP < 7.2.
 	EXTENSIONS += mcrypt
 endif
-ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to 5.x series images.
 	EXTENSIONS += mysql
 endif
diff --git a/compat/Makefile b/compat/Makefile
index 3c3b7aa..d03ab9c 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -32,11 +32,11 @@ EXTENSIONS := \
 	xsl \
 	zip \
 	sockets
-ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to PHP < 7.2.
 	EXTENSIONS += mcrypt
 endif
-ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to 5.x series images.
 	EXTENSIONS += mysql
 endif
diff --git a/dev/Makefile b/dev/Makefile
index d9b1b6a..4c4fd4a 100644
--- a/dev/Makefile
+++ b/dev/Makefile
@@ -34,11 +34,11 @@ EXTENSIONS := \
 	xsl \
 	zip \
 	sockets
-ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to PHP < 7.2.
 	EXTENSIONS += mcrypt
 endif
-ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to 5.x series images.
 	EXTENSIONS += mysql
 endif
diff --git a/pcov/Makefile b/pcov/Makefile
index 235212f..1dd324a 100644
--- a/pcov/Makefile
+++ b/pcov/Makefile
@@ -34,7 +34,7 @@ EXTENSIONS := \
 	xsl \
 	zip \
 	sockets
-ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to PHP < 7.2.
 	EXTENSIONS += mcrypt
 endif
diff --git a/xhprof/Makefile b/xhprof/Makefile
index d62f300..f8817b7 100644
--- a/xhprof/Makefile
+++ b/xhprof/Makefile
@@ -34,11 +34,11 @@ EXTENSIONS := \
 	xhprof \
 	xsl \
 	zip
-ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to PHP < 7.2.
 	EXTENSIONS += mcrypt
 endif
-ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 latest alpine))
+ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 latest alpine))
 	# Add more extensions to 5.x series images.
 	EXTENSIONS += mysql
 endif