diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php
index a1a94b56b43..62f639b48e4 100644
--- a/apps/provisioning_api/lib/Controller/GroupsController.php
+++ b/apps/provisioning_api/lib/Controller/GroupsController.php
@@ -78,10 +78,10 @@ class GroupsController extends AUserDataOCSController {
 	#[NoAdminRequired]
 	public function getGroups(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_values(array_map(function ($group) {
+		$groups = array_map(function ($group) {
 			/** @var IGroup $group */
 			return $group->getGID();
-		}, $groups));
+		}, $groups);
 
 		return new DataResponse(['groups' => $groups]);
 	}
@@ -101,7 +101,7 @@ class GroupsController extends AUserDataOCSController {
 	#[AuthorizedAdminSetting(settings: Users::class)]
 	public function getGroupsDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_values(array_map(function ($group) {
+		$groups = array_map(function ($group) {
 			/** @var IGroup $group */
 			return [
 				'id' => $group->getGID(),
@@ -111,7 +111,7 @@ class GroupsController extends AUserDataOCSController {
 				'canAdd' => $group->canAddUser(),
 				'canRemove' => $group->canRemoveUser(),
 			];
-		}, $groups));
+		}, $groups);
 
 		return new DataResponse(['groups' => $groups]);
 	}
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 839861094f0..df8b4d89e8b 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3752,8 +3752,6 @@
   <file src="lib/private/Group/Manager.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[$groups]]></code>
-      <code><![CDATA[array_values($groups)]]></code>
-      <code><![CDATA[array_values($groups)]]></code>
     </LessSpecificReturnStatement>
     <MoreSpecificReturnType>
       <code><![CDATA[\OC\Group\Group[]]]></code>
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
index 8feb027d180..1dcbcfd7a0c 100644
--- a/lib/private/Group/Manager.php
+++ b/lib/private/Group/Manager.php
@@ -264,12 +264,6 @@ class Manager extends PublicEmitter implements IGroupManager {
 		}
 	}
 
-	/**
-	 * @param string $search
-	 * @param ?int $limit
-	 * @param ?int $offset
-	 * @return \OC\Group\Group[]
-	 */
 	public function search(string $search, ?int $limit = null, ?int $offset = 0) {
 		$groups = [];
 		foreach ($this->backends as $backend) {
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 765e8fa3d7b..adffe09f2e8 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -269,14 +269,6 @@ class Manager extends PublicEmitter implements IUserManager {
 		return $users;
 	}
 
-	/**
-	 * Search by displayName
-	 *
-	 * @param string $pattern
-	 * @param int $limit
-	 * @param int $offset
-	 * @return IUser[]
-	 */
 	public function searchDisplayName($pattern, $limit = null, $offset = null) {
 		$users = [];
 		foreach ($this->backends as $backend) {
diff --git a/lib/public/IGroupManager.php b/lib/public/IGroupManager.php
index ee88990df79..eda95187f63 100644
--- a/lib/public/IGroupManager.php
+++ b/lib/public/IGroupManager.php
@@ -75,7 +75,7 @@ interface IGroupManager {
 	 * @param string $search
 	 * @param ?int $limit
 	 * @param ?int $offset
-	 * @return \OCP\IGroup[]
+	 * @return list<IGroup>
 	 * @since 8.0.0
 	 */
 	public function search(string $search, ?int $limit = null, ?int $offset = 0);
diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php
index 973e1c5ef40..226a52809a3 100644
--- a/lib/public/IUserManager.php
+++ b/lib/public/IUserManager.php
@@ -114,7 +114,7 @@ interface IUserManager {
 	 * @param string $pattern
 	 * @param int $limit
 	 * @param int $offset
-	 * @return \OCP\IUser[]
+	 * @return list<IUser>
 	 * @since 8.0.0
 	 */
 	public function searchDisplayName($pattern, $limit = null, $offset = null);