diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b387b0f..0f738ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  HIGHEST_PHP_VERSION: "8.4"
+  HIGHEST_STABLE_PHP_VERSION: "8.5"
 
 jobs:
   phpstan:
@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ env.HIGHEST_PHP_VERSION }}
+          php-version: ${{ env.HIGHEST_STABLE_PHP_VERSION }}
 
       - name: Install composer dependencies
         uses: ramsey/composer-install@v3
@@ -29,7 +29,7 @@ jobs:
 
   coding-standard:
     name: Coding Standard
-    uses: brick/coding-standard/.github/workflows/coding-standard.yml@v4
+    uses: brick/coding-standard/.github/workflows/coding-standard.yml@v6
     with:
       php-version: "8.2"
       working-directory: "tools/ecs"
@@ -45,18 +45,20 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
+          - "8.6"
         pdo-emulate-prepares:
           - "OFF"
         pdo-errmode:
           - "EXCEPTION"
         include:
-          - php-version: "8.4"
+          - php-version: "8.5"
             pdo-emulate-prepares: "ON"
             pdo-errmode: "EXCEPTION"
-          - php-version: "8.4"
+          - php-version: "8.5"
             pdo-emulate-prepares: "OFF"
             pdo-errmode: "SILENT"
-          - php-version: "8.4"
+          - php-version: "8.5"
             pdo-emulate-prepares: "OFF"
             pdo-errmode: "WARNING"
 
@@ -93,7 +95,7 @@ jobs:
           MYSQL_PASSWORD: password
           PDO_EMULATE_PREPARES: ${{ matrix.pdo-emulate-prepares }}
           PDO_ERRMODE: ${{ matrix.pdo-errmode }}
-        if: ${{ matrix.php-version != env.HIGHEST_PHP_VERSION }}
+        if: ${{ matrix.php-version != env.HIGHEST_STABLE_PHP_VERSION }}
 
       - name: Run PHPUnit with coverage
         run: vendor/bin/phpunit --coverage-php coverage.php
@@ -104,17 +106,17 @@ jobs:
           MYSQL_PASSWORD: password
           PDO_EMULATE_PREPARES: ${{ matrix.pdo-emulate-prepares }}
           PDO_ERRMODE: ${{ matrix.pdo-errmode }}
-        if: ${{ matrix.php-version == env.HIGHEST_PHP_VERSION }}
+        if: ${{ matrix.php-version == env.HIGHEST_STABLE_PHP_VERSION }}
 
       - name: Merge worker coverage
         run: php tools/merge-coverage.php coverage.php clover.xml && rm coverage.php
-        if: ${{ matrix.php-version == env.HIGHEST_PHP_VERSION }}
+        if: ${{ matrix.php-version == env.HIGHEST_STABLE_PHP_VERSION }}
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        if: ${{ matrix.php-version == env.HIGHEST_PHP_VERSION }}
+        if: ${{ matrix.php-version == env.HIGHEST_STABLE_PHP_VERSION }}
 
   phpunit-mysql-doctrine:
     name: PHPUnit MySQL / Doctrine
@@ -126,7 +128,7 @@ jobs:
         deps:
           - "highest"
         php-version:
-          - "8.4"
+          - "8.5"
         include:
           - php-version: "8.2"
             deps: "lowest"
@@ -181,7 +183,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.4"
+          - "8.5"
 
     services:
       mariadb:
@@ -231,7 +233,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.4"
+          - "8.5"
 
     services:
       mariadb:
@@ -280,7 +282,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.4"
+          - "8.5"
 
     services:
       postgres:
@@ -328,7 +330,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.4"
+          - "8.5"
 
     services:
       postgres:
diff --git a/tests/PostgresHasherTest.php b/tests/PostgresHasherTest.php
index 6e1e1f3..ca078da 100644
--- a/tests/PostgresHasherTest.php
+++ b/tests/PostgresHasherTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 declare(strict_types=1);
 
 namespace Brick\Lock\Tests;
diff --git a/tools/ecs/composer.json b/tools/ecs/composer.json
index 5298cff..4863c70 100644
--- a/tools/ecs/composer.json
+++ b/tools/ecs/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "brick/coding-standard": "v4"
+        "brick/coding-standard": "v6"
     },
     "config": {
         "allow-plugins": {