diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
index e3a35fc..5df5cce 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/qa.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: PHP Setup
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
 
       - name: Validate composer.json
         run: composer validate --ansi --strict
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index ec5bcbd..a7f820e 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -18,17 +18,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ "8.1", "8.2", "8.3", "8.4" ]
-        pimcore-version: [ "^11.5", "^12.0" ]
+        php-version: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
+        pimcore-version: [ "^11.5", "^12.0", "^2026.1" ]
         phpunit-version: [ "^9.6", "^10.5" ]
         dependencies: [ "highest" ]
         exclude:
           - php-version: "8.1"
             pimcore-version: "^12.0"
+          - php-version: "8.1"
+            pimcore-version: "^2026.1"
           - php-version: "8.2"
             pimcore-version: "^12.0"
+          - php-version: "8.2"
+            pimcore-version: "^2026.1"
+          - php-version: "8.3"
+            pimcore-version: "^2026.1"
           - php-version: "8.4"
             pimcore-version: "^11.5"
+          - php-version: "8.5"
+            pimcore-version: "^11.5"
+          - php-version: "8.5"
+            pimcore-version: "^12.0"
         include:
           - php-version: "8.1"
             pimcore-version: "^11.5"
@@ -46,6 +56,14 @@ jobs:
             pimcore-version: "^12.0"
             phpunit-version: "^10.5"
             dependencies: "lowest"
+          - php-version: "8.4"
+            pimcore-version: "^12.0"
+            phpunit-version: "^9.6"
+            dependencies: "lowest"
+          - php-version: "8.4"
+            pimcore-version: "^12.0"
+            phpunit-version: "^10.5"
+            dependencies: "lowest"
 
     env:
       MYSQL_HOST: 127.0.0.1
diff --git a/compose.yaml b/compose.yaml
index e53c422..b0d9259 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -16,7 +16,7 @@ services:
       timeout: 10s
 
   php:
-    image: pimcore/pimcore:php8.4-debug-latest
+    image: pimcore/pimcore:php8.5-debug-latest
     volumes:
       - ./:/var/www/html/
     environment:
diff --git a/composer.json b/composer.json
index 50e22cf..dca32bc 100644
--- a/composer.json
+++ b/composer.json
@@ -19,11 +19,10 @@
     }
   ],
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
     "doctrine/persistence": "^3.1",
     "phpunit/phpunit": "^9.6 || ^10.5",
-    "pimcore/admin-ui-classic-bundle": "^1.6 || ^2.0",
-    "pimcore/pimcore": "^11.5 || ^12.0",
+    "pimcore/pimcore": "^11.5 || ^12.0 || ^2026.1",
     "psr/log": "^2.0 || ^3.0",
     "symfony/config": "^6.4 || ^7.3",
     "symfony/console": "^6.4 || ^7.3",