diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 08c35e3..e0d2c0e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,7 +40,9 @@ jobs:
                     - { tag: '3.x', php: '8.3', distro: bookworm, version-override: "v3-dev", latest-tag: false }
                     - { tag: 'v4.0', php: '8.4', distro: bookworm, version-override: "", latest-tag: true }
                     - { tag: '4.x', php: '8.4', distro: bookworm, version-override: "v4-dev", latest-tag: false }
-
+                    - { tag: '5.x', php: '8.5', distro: trixie, version-override: "", latest-tag: false }
+                    # - { tag: 'v5.0', php: '8.5', distro: trixie, version-override: "", latest-tag: false } 
+                    # - { tag: '5.x', php: '8.5', distro: trixie, version-override: "v5-dev", latest-tag: false } 
 
         steps:
             -   uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f36001d..2f93ada 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,6 +16,8 @@ jobs:
                 include:
                     - { php: '8.3', distro: bookworm }
                     - { php: '8.4', distro: bookworm }
+                    - { php: '8.5', distro: trixie, composerOptions: '--ignore-platform-reqs' }
+
         steps:
             -   uses: actions/checkout@v2
             -   name: Build Image
@@ -49,7 +51,7 @@ jobs:
                             docker run --rm pimcore-image test ! -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
                         fi
 
-                        docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.x-dev pimcore --no-scripts
+                        docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.x-dev pimcore --no-scripts ${{ matrix.composerOptions }}
 
                         if [ "$imageVariant" != "min" ]; then
                             docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php
diff --git a/Dockerfile b/Dockerfile
index 2b21937..8c81991 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,18 @@
 # syntax=docker/dockerfile:1
 
-ARG PHP_VERSION="8.4"
-ARG DEBIAN_VERSION="bookworm"
+ARG PHP_VERSION="8.5"
+ARG DEBIAN_VERSION="trixie"
 
 FROM php:${PHP_VERSION}-fpm-${DEBIAN_VERSION} AS pimcore_php_min
 
+ARG DEBIAN_VERSION
+
 COPY --chmod=0755 files/build-*.sh /usr/local/bin/
 
 RUN set -eux; \
     \
     DPKG_ARCH="$(dpkg --print-architecture)"; \
-    echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list; \
+    echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-backports main" > /etc/apt/sources.list.d/backports.list; \
     apt-get update; \
     apt-get upgrade -y; \
     \
@@ -37,7 +39,6 @@ RUN set -eux; \
         exif \
         gd \
         intl \
-        opcache \
         pcntl \
         pdo_mysql \
         sockets \
@@ -94,19 +95,15 @@ WORKDIR /var/www/html
 
 CMD ["php-fpm"]
 
-
-
-
 FROM pimcore_php_min AS pimcore_php_default
 
+ARG DEBIAN_VERSION
+
 RUN set -eux; \
     \
     build-install.sh; \
     \
     DPKG_ARCH="$(dpkg --print-architecture)"; \
-    echo "deb https://www.deb-multimedia.org bookworm main non-free" > /etc/apt/sources.list.d/deb-multimedia.list; \
-    apt-get update -oAcquire::AllowInsecureRepositories=true; \
-    apt-get install -y --allow-unauthenticated deb-multimedia-keyring; \
     apt-get update; \
     \
     # tools used by Pimcore
@@ -133,8 +130,8 @@ RUN set -eux; \
     \
     # ImageMagick
     apt-get install -y \
-        imagemagick-7 \
-        libmagickwand-7-dev \
+        imagemagick \
+        libmagickwand-dev \
     ; \
     \
     docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp; \
@@ -159,9 +156,6 @@ RUN set -eux; \
 
 CMD ["php-fpm"]
 
-
-
-
 FROM pimcore_php_default AS pimcore_php_max
 
 RUN set -eux; \
@@ -170,7 +164,6 @@ RUN set -eux; \
     \
     apt-get install -y \
         chromium-sandbox \
-        libc-client-dev \
         libkrb5-dev \
         libreoffice \
         libxml2-dev \
@@ -190,9 +183,6 @@ RUN set -eux; \
 
 CMD ["php-fpm"]
 
-
-
-
 FROM pimcore_php_default AS pimcore_php_debug
 
 RUN set -eux; \
diff --git a/README.md b/README.md
index 74a26f7..0fa442a 100644
--- a/README.md
+++ b/README.md
@@ -35,12 +35,13 @@ Use either of the following commands:
 
 
 ### Pimcore version compatibility & recommendations
-| Image / Pimcore | v10 | v11 | v2023.3 | v2024.4 |v2025.x
-|-----------------|-----|-----|---------|---------|------|
-| v1              | ✅  | ✅  | ✅      | ✅      | ❌   |
-| v2              | ❌  | ✅  | ✅      | ✅      | ❌   | 
-| v3              | ❌  | ✅* | ✅*     | ✅*     | ✅   |
-| v4              | ❌  | ❌  | ❌      | ❌      | ✅*  |
+| Image / Pimcore | v10 | v11 | v2023.3 | v2024.4 |v2025.4 | v2026.x | 
+|-----------------|-----|-----|---------|---------|------| ------|
+| v1              | ✅  | ✅  | ✅      | ✅      | ❌   | ❌ |
+| v2              | ❌  | ✅  | ✅      | ✅      | ❌   | ❌ |
+| v3              | ❌  | ✅* | ✅*     | ✅*     | ✅   | ✅ |
+| v4              | ❌  | ❌  | ❌      | ❌      | ✅*  | ✅ |
+| v5              | ❌  | ❌  | ❌      | ❌      | ✅   | ✅* |
 
 > *) recommended version