diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 06643d2..c541219 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f47064c..8049bed 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index 1d34170..49e9b70 100644
--- a/7.4/Dockerfile
+++ b/7.4/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.0.1 AS final
+FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.0 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 035422d..ce10ef8 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.0.1 AS final
+FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.0 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
index 5273a10..9902829 100644
--- a/8.1/Dockerfile
+++ b/8.1/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.0.1 AS final
+FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.0 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
index a7d4946..59ffb97 100644
--- a/8.2/Dockerfile
+++ b/8.2/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.0 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
index 96e9d8f..1da336d 100644
--- a/8.3/Dockerfile
+++ b/8.3/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.3/NGINX_BASE b/8.3/NGINX_BASE
index f778270..feb3aeb 100644
--- a/8.3/NGINX_BASE
+++ b/8.3/NGINX_BASE
@@ -1 +1 @@
-nginx1.28-alpine3.22
\ No newline at end of file
+nginx1.28-alpine3.23
\ No newline at end of file
diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD
index 598559f..9739da8 100644
--- a/8.3/overlay/tmp/PHP_BUILD
+++ b/8.3/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.3.27-r0
\ No newline at end of file
+8.3.28-r0
\ No newline at end of file
diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION
index eb43379..6b28411 100644
--- a/8.3/overlay/tmp/PHP_REVISION
+++ b/8.3/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.3.27
\ No newline at end of file
+8.3.28
\ No newline at end of file
diff --git a/8.4/Dockerfile b/8.4/Dockerfile
index b32d125..b7c41bc 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.4/NGINX_BASE b/8.4/NGINX_BASE
index f778270..feb3aeb 100644
--- a/8.4/NGINX_BASE
+++ b/8.4/NGINX_BASE
@@ -1 +1 @@
-nginx1.28-alpine3.22
\ No newline at end of file
+nginx1.28-alpine3.23
\ No newline at end of file
diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD
index 577cf8d..493449e 100644
--- a/8.4/overlay/tmp/PHP_BUILD
+++ b/8.4/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.4.14-r0
\ No newline at end of file
+8.4.15-r0
\ No newline at end of file
diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION
index 478188d..79745a8 100644
--- a/8.4/overlay/tmp/PHP_REVISION
+++ b/8.4/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.4.14
\ No newline at end of file
+8.4.15
\ No newline at end of file
diff --git a/8.5/Dockerfile b/8.5/Dockerfile
new file mode 100644
index 0000000..6119a0e
--- /dev/null
+++ b/8.5/Dockerfile
@@ -0,0 +1,42 @@
+#======================================================================================================================
+# STAGE 0: get Nu scripts from the PHP image overlay
+#======================================================================================================================
+
+FROM quay.io/bfren/alpine AS php
+
+WORKDIR /tmp
+RUN \
+    # get the Nu scripts from the PHP image overlay
+    echo "Cloning Alpine overlay." && \
+    apk add git && git clone --branch v3.1.0 https://github.com/bfren/docker-php.git && \
+    mkdir /overlay && \
+    mv docker-php/overlay/etc /overlay/
+
+
+#======================================================================================================================
+# STAGE 1: create final image
+#======================================================================================================================
+
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final
+COPY --from=php /overlay /
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+COPY ./overlay /
+COPY ./8.5/overlay /
+
+ENV \
+    # PHP config directory
+    BF_PHP_DIR="/etc/php85" \
+    # offical php.ini template to download
+    BF_PHP_ENV="production" \
+    # space-separated extensions to install on startup
+    BF_PHP_EXT= \
+    # PHP package prefix
+    BF_PHP_PREFIX="php85"
+
+RUN bf-install
diff --git a/8.5/NGINX_BASE b/8.5/NGINX_BASE
new file mode 100644
index 0000000..feb3aeb
--- /dev/null
+++ b/8.5/NGINX_BASE
@@ -0,0 +1 @@
+nginx1.28-alpine3.23
\ No newline at end of file
diff --git a/8.5/PHP_PREFIX b/8.5/PHP_PREFIX
new file mode 100644
index 0000000..e0d78da
--- /dev/null
+++ b/8.5/PHP_PREFIX
@@ -0,0 +1 @@
+php85
\ No newline at end of file
diff --git a/8.5/overlay/tmp/PHP_BUILD b/8.5/overlay/tmp/PHP_BUILD
new file mode 100644
index 0000000..c788c7b
--- /dev/null
+++ b/8.5/overlay/tmp/PHP_BUILD
@@ -0,0 +1 @@
+8.5.0-r0
\ No newline at end of file
diff --git a/8.5/overlay/tmp/PHP_REVISION b/8.5/overlay/tmp/PHP_REVISION
new file mode 100644
index 0000000..5eaed3b
--- /dev/null
+++ b/8.5/overlay/tmp/PHP_REVISION
@@ -0,0 +1 @@
+8.5.0
\ No newline at end of file
diff --git a/README.md b/README.md
index 37786c3..e896f61 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [Docker Repository](https://hub.docker.com/r/bfren/nginx-php) - [bfren ecosystem](https://github.com/bfren/docker)
 
-Nginx plus PHP (7.4, 8.0, 8.1, 8.2 and 8.3) - no SSL support etc, designed to be used behind a proxy server.  Minimal PHP packages are installed:
+Nginx plus PHP (7.4, 8.0, 8.1, 8.2, 8.3, 8.4 and 8.5) - no SSL support etc, designed to be used behind a proxy server.  Minimal PHP packages are installed:
 
 * `php`
 * `php-common`
diff --git a/VERSION b/VERSION
index 5210382..da15618 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.1
\ No newline at end of file
+8.1.0
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index b293f64..8d1eec6 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-8.0
\ No newline at end of file
+8.1
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index b48f4df..300e353 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,9 +4,9 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="7.0.1"
-PHP_BRANCH="v3.0.1"
-PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"
+BASE_VERSION="7.1.0"
+PHP_BRANCH="v3.1.0"
+PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5"
 
 for V in ${PHP_VERSIONS} ; do
 
diff --git a/overlay/tmp/install b/overlay/tmp/install
index d4deafa..677b179 100644
--- a/overlay/tmp/install
+++ b/overlay/tmp/install
@@ -13,11 +13,15 @@ def main [] {
     let packages = [
         $"($prefix)=($version)"
         $"($prefix)-fpm=($version)"
-        $"($prefix)-opcache=($version)"
         $"($prefix)-session=($version)"
     ]
     bf pkg install $packages
 
+    # opcache is part of PHP >= 8.5
+    if not ($version | bf version is_at_least "8.5.0") {
+        bf pkg install [$"($prefix)-opcache=($version)"]
+    }
+
     # create symlinks so PHP can be called on the commandline using php and php-fpm
     let php = "/usr/bin/php"
     let fpm = "/usr/sbin/php-fpm"
diff --git a/run.sh b/run.sh
index a29ad46..266af10 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-PHP=${1:-8.4}
+PHP=${1:-8.5}
 
 docker buildx build \
     --load \
diff --git a/test.sh b/test.sh
index c547aeb..88d85c8 100644
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 
 IMAGE=nginx-php
 VERSION=`cat VERSION`
-PHP=${1:-8.4}
+PHP=${1:-8.5}
 TAG=${IMAGE}-test
 
 docker buildx build \