diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dc2752b..2c91c55 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
 
-    name: PHP 8.3
+    name: PHP 8.5
 
     steps:
       - name: Checkout
@@ -20,7 +20,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.5
           tools: composer
           coverage: xdebug
 
@@ -58,8 +58,8 @@ jobs:
           composer global require php-coveralls/php-coveralls
           php-coveralls --coverage_clover=build/logs/clover.xml -v
 
-  tests-last:
-    runs-on: ubuntu-22.04
+  tests-latest:
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
 
     name: PHP Latest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79714d2..9fcddee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 ---
-image: registry.gitlab.com/aplus-framework/images/base:4
+image: registry.gitlab.com/aplus-framework/images/base:6
 
 include:
   - template: Security/SAST.gitlab-ci.yml
diff --git a/composer.json b/composer.json
index 3288241..4ff767b 100644
--- a/composer.json
+++ b/composer.json
@@ -33,13 +33,13 @@
         }
     ],
     "require": {
-        "php": ">=8.3",
+        "php": ">=8.5",
         "ext-posix": "*",
-        "aplus/language": "^4.0"
+        "aplus/language": "^5.0"
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "aplus/coding-standard": "^2.8",
+        "aplus/coding-standard": "^3.0",
         "ergebnis/composer-normalize": "^2.25",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
@@ -68,7 +68,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.x-dev"
+            "dev-master": "4.x-dev"
         }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 41e339d..de955f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,6 @@
-version: "3"
 services:
   package:
-    image: registry.gitlab.com/aplus-framework/images/package:4
+    image: registry.gitlab.com/aplus-framework/images/package:6
     container_name: package-cli
     working_dir: /package
     volumes: