diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f912807c..21f8d5f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.2', '8.3', '8.4' ]
+        php: [ '8.2', '8.3', '8.4', '8.5' ]
     steps:
 
       - name: Checkout ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
diff --git a/.github/workflows/nightly-6.yml b/.github/workflows/nightly-6.yml
deleted file mode 100644
index dadee170..00000000
--- a/.github/workflows/nightly-6.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: "nightly-6"
-on:
-    schedule:
-        - cron: '42 5 * * *'
-    workflow_dispatch:
-
-jobs:
-    nightly-7:
-        name: "dispatch-nightly-6"
-        runs-on: ubuntu-22.04
-        permissions: write-all
-        steps:
-            - name: Checkout '6'
-              uses: actions/checkout@v4
-              with:
-                  ref: '6'
-
-            - name: Execute 'ci.yml' on '6'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              run: |
-                  gh workflow run ci.yml --ref 6
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index 48b168fd..c632fd39 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -44,6 +44,7 @@ Options:
             - 8.2 (default): use PHP 8.2
             - 8.3: use PHP 8.3
             - 8.4: use PHP 8.4
+            - 8.5: use PHP 8.5
 
     -x
         Only with -s cgl|unit
@@ -114,7 +115,7 @@ while getopts ":b:s:p:hxn" OPT; do
             ;;
         p)
             PHP_VERSION=${OPTARG}
-            if ! [[ ${PHP_VERSION} =~ ^(8.2|8.3|8.4)$ ]]; then
+            if ! [[ ${PHP_VERSION} =~ ^(8.2|8.3|8.4|8.5)$ ]]; then
                 INVALID_OPTIONS+=("${OPTARG}")
             fi
             ;;
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 461c373c..a39ba5db 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -3,7 +3,7 @@ parameters:
 		-
 			message: '#^Offset 0 on non\-empty\-list\<string\> on left side of \?\? always exists and is not nullable\.$#'
 			identifier: nullCoalesce.offset
-			count: 1
+			count: 2
 			path: ../../Classes/Composer/ComposerPackageManager.php
 
 		-
diff --git a/Classes/Core/Functional/Framework/DataHandling/ActionService.php b/Classes/Core/Functional/Framework/DataHandling/ActionService.php
index e376435a..bb8fc716 100644
--- a/Classes/Core/Functional/Framework/DataHandling/ActionService.php
+++ b/Classes/Core/Functional/Framework/DataHandling/ActionService.php
@@ -428,7 +428,7 @@ public function publishRecords(array $tableLiveUids, bool $throwException = true
                 $versionedUid = $this->getVersionedId($tableName, (int)$liveUid);
                 if (empty($versionedUid)) {
                     if ($throwException) {
-                        throw new Exception('Versioned UID could not be determined', 1476049592);
+                        throw new Exception('Versioned UID of ' . $tableName . ':' . $liveUid . ' could not be determined', 1476049592);
                     }
                     continue;
                 }