diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index 8310c3cebf1..22db44fca03 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '8.2', '8.3', '8.4' ]
+        php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
 
     name: php-lint
 
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index 1758fc83eac..e329261d55a 100644
--- a/.github/workflows/phpunit-mariadb.yml
+++ b/.github/workflows/phpunit-mariadb.yml
@@ -60,13 +60,15 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.2']
-        mariadb-versions: ['10.3', '10.6', '10.11', '11.4', '11.8']
+        mariadb-versions: ['10.6', '10.11', '11.4', '11.8']
         include:
           - php-versions: '8.3'
             mariadb-versions: '10.11'
             coverage: ${{ github.event_name != 'pull_request' }}
           - php-versions: '8.4'
             mariadb-versions: '11.8'
+          - php-versions: '8.5'
+            mariadb-versions: '11.8'
 
     name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml
index 16c7d91827b..4c1a32b64b9 100644
--- a/.github/workflows/phpunit-memcached.yml
+++ b/.github/workflows/phpunit-memcached.yml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index f0635d5a3ef..f7de37051f6 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -67,6 +67,8 @@ jobs:
             coverage: ${{ github.event_name != 'pull_request' }}
           - mysql-versions: '8.4'
             php-versions: '8.4'
+          - mysql-versions: '8.4'
+            php-versions: '8.5'
 
     name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml
index c23e620da20..a6487011639 100644
--- a/.github/workflows/phpunit-nodb.yml
+++ b/.github/workflows/phpunit-nodb.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index c489810c6db..c414dfb76e2 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -69,6 +69,8 @@ jobs:
             php-versions: '8.3'
           - oracle-versions: '23'
             php-versions: '8.4'
+          - oracle-versions: '23'
+            php-versions: '8.5'
 
     name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index e67767f61de..f139ca90d4d 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -68,6 +68,8 @@ jobs:
             coverage: ${{ github.event_name != 'pull_request' }}
           - php-versions: '8.4'
             postgres-versions: '18'
+          - php-versions: '8.5'
+            postgres-versions: '18'
 
     name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 76a66f18507..9f92d6ba5e2 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
diff --git a/lib/versioncheck.php b/lib/versioncheck.php
index d1073d84c4e..dd7790ff961 100644
--- a/lib/versioncheck.php
+++ b/lib/versioncheck.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-// Show warning if a PHP version below 8.1 is used,
+// Show warning if a PHP version below 8.2 is used,
 if (PHP_VERSION_ID < 80200) {
 	http_response_code(500);
 	echo 'This version of Nextcloud requires at least PHP 8.2<br/>';
@@ -13,10 +13,10 @@ if (PHP_VERSION_ID < 80200) {
 	exit(1);
 }
 
-// Show warning if >= PHP 8.5 is used as Nextcloud is not compatible with >= PHP 8.5 for now
-if (PHP_VERSION_ID >= 80500) {
+// Show warning if >= PHP 8.6 is used as Nextcloud is not compatible with >= PHP 8.6 for now
+if (PHP_VERSION_ID >= 80600) {
 	http_response_code(500);
-	echo 'This version of Nextcloud is not compatible with PHP>=8.5.<br/>';
+	echo 'This version of Nextcloud is not compatible with PHP>=8.6.<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '.';
 	exit(1);
 }