diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index 1f963a2f005f9..21b9d6aa7d8ec 100644
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -53,7 +53,7 @@ jobs:
         uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: Update psalm baseline
+          commit-message: "chore(tests): Update psalm baseline"
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 4ab1fc1dd2d66..c2a606e417057 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -508,7 +508,6 @@
       <code>\OCA\Circles\Api\v1\Circles</code>
     </UndefinedClass>
     <UndefinedInterfaceMethod>
-      <code>getById</code>
       <code>getPath</code>
     </UndefinedInterfaceMethod>
   </file>
@@ -813,12 +812,6 @@
       <code>$shareId</code>
       <code>(int)$data['id']</code>
     </InvalidArgument>
-    <LessSpecificReturnStatement>
-      <code>$nodes[0]</code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code>\OCP\Files\File|\OCP\Files\Folder</code>
-    </MoreSpecificReturnType>
   </file>
   <file src="apps/federatedfilesharing/lib/Notifications.php">
     <InvalidReturnType>
@@ -1112,15 +1105,8 @@
     </InvalidReturnType>
   </file>
   <file src="apps/files_trashbin/lib/Trash/LegacyTrashBackend.php">
-    <RedundantCondition>
-      <code>$trashFiles</code>
-    </RedundantCondition>
-    <TypeDoesNotContainType>
-      <code>null</code>
-    </TypeDoesNotContainType>
     <UndefinedInterfaceMethod>
       <code>$file</code>
-      <code>getById</code>
     </UndefinedInterfaceMethod>
   </file>
   <file src="apps/files_trashbin/lib/Trashbin.php">
@@ -1229,14 +1215,6 @@
       <code>array{0: int, 1: int, 2: int}</code>
     </InvalidReturnType>
   </file>
-  <file src="apps/updatenotification/lib/Notification/BackgroundJob.php">
-    <InvalidArgument>
-      <code>false</code>
-    </InvalidArgument>
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[$this->users]]></code>
-    </InvalidPropertyAssignmentValue>
-  </file>
   <file src="apps/user_ldap/ajax/getNewServerConfigPrefix.php">
     <InvalidScalarArgument>
       <code>$ln + 1</code>
@@ -1416,21 +1394,11 @@
       <code>isUserScopeEnabled</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php">
-    <ParamNameMismatch>
-      <code>$arguments</code>
-    </ParamNameMismatch>
-  </file>
   <file src="core/BackgroundJobs/CheckForUserCertificates.php">
     <ParamNameMismatch>
       <code>$arguments</code>
     </ParamNameMismatch>
   </file>
-  <file src="core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php">
-    <ParamNameMismatch>
-      <code>$arguments</code>
-    </ParamNameMismatch>
-  </file>
   <file src="core/Command/App/Install.php">
     <TypeDoesNotContainType>
       <code>$result === false</code>
@@ -2238,7 +2206,6 @@
   <file src="lib/private/Files/Node/Folder.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[$this->root->get($this->getFullPath($path))]]></code>
-      <code><![CDATA[$this->root->getByIdInPath((int)$id, $this->getPath())]]></code>
       <code><![CDATA[array_map(function (FileInfo $file) {
 			return $this->createNode($file->getPath(), $file);
 		}, $files)]]></code>
@@ -2934,15 +2901,6 @@
       <code><![CDATA[$this->dbprettyname]]></code>
     </UndefinedThisPropertyFetch>
   </file>
-  <file src="lib/private/Share/Share.php">
-    <InvalidOperand>
-      <code>!self::isResharingAllowed()</code>
-    </InvalidOperand>
-    <UndefinedInterfaceMethod>
-      <code>getParents</code>
-      <code>getParents</code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="lib/private/Share20/DefaultShareProvider.php">
     <InvalidArgument>
       <code><![CDATA[$share->getId()]]></code>
@@ -3004,12 +2962,6 @@
       <code>private $roomShareProvider = null;</code>
       <code>private $shareByCircleProvider = null;</code>
     </UndefinedDocblockClass>
-    <UndefinedInterfaceMethod>
-      <code>getLazyRootFolder</code>
-      <code>getLazyRootFolder</code>
-      <code>getLazyRootFolder</code>
-      <code>getLazyRootFolder</code>
-    </UndefinedInterfaceMethod>
   </file>
   <file src="lib/private/Share20/Share.php">
     <LessSpecificReturnStatement>