diff --git a/Dockerfile b/Dockerfile
index ef5a4c6..387235e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.23
 
 # set version label
 ARG BUILD_DATE
@@ -16,16 +16,15 @@ RUN \
     yarn && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-gd \
-    php83-intl \
-    php83-ldap \
-    php83-opcache \
-    php83-pdo \
-    php83-pdo_sqlite \
-    php83-tokenizer && \
+    php85-gd \
+    php85-intl \
+    php85-ldap \
+    php85-pdo \
+    php85-pdo_sqlite \
+    php85-tokenizer && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf && \
   echo "**** install grocy ****" && \
   mkdir -p /app/www && \
   if [ -z ${GROCY_RELEASE+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7cafb2f..acce5fc 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.23
 
 # set version label
 ARG BUILD_DATE
@@ -16,16 +16,15 @@ RUN \
     yarn && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-gd \
-    php83-intl \
-    php83-ldap \
-    php83-opcache \
-    php83-pdo \
-    php83-pdo_sqlite \
-    php83-tokenizer && \
+    php85-gd \
+    php85-intl \
+    php85-ldap \
+    php85-pdo \
+    php85-pdo_sqlite \
+    php85-tokenizer && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf && \
   echo "**** install grocy ****" && \
   mkdir -p /app/www && \
   if [ -z ${GROCY_RELEASE+x} ]; then \
diff --git a/README.md b/README.md
index 0bb84fd..e466fb8 100644
--- a/README.md
+++ b/README.md
@@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.03.26:** - Rebase to Alpine 3.23 with php 8.5.
 * **02.05.24:** - Rebase to Alpine 3.21. Add php-opcache package.
 * **30.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **29.03.24:** - Add `clear_env = no` to `php-fpm` to pass on environment variables to workers threads
diff --git a/readme-vars.yml b/readme-vars.yml
index 507e350..661cf76 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -87,6 +87,7 @@ init_diagram: |
   "grocy:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "07.03.26:", desc: "Rebase to Alpine 3.23 with php 8.5."}
   - {date: "02.05.24:", desc: "Rebase to Alpine 3.21. Add php-opcache package."}
   - {date: "30.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "29.03.24:", desc: "Add `clear_env = no` to `php-fpm` to pass on environment variables to workers threads"}
diff --git a/root/etc/php83/conf.d/grocy.ini b/root/etc/php85/conf.d/grocy.ini
similarity index 100%
rename from root/etc/php83/conf.d/grocy.ini
rename to root/etc/php85/conf.d/grocy.ini