diff --git a/composer.json b/composer.json
index c93f02e145..556a00d3a0 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "ibexa/doctrine-schema": "~4.6.0@dev",
         "ibexa/http-cache": "~4.6.0@dev",
-        "ibexa/code-style": "^2.2.x-dev",
+        "ibexa/code-style": "dev-bump-php-cs-fixer-to-v3.89.0 as 2.2.x-dev",
         "ibexa/notifications": "~4.6.0@dev",
         "ibexa/phpstan": "~4.6.x-dev",
         "ibexa/test-rest": "^0.1.x-dev",
diff --git a/src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php b/src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php
index 48a584f4db..c39acf8337 100644
--- a/src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php
+++ b/src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php
@@ -12,9 +12,7 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
 use Ibexa\Contracts\Rest\Input\Parser\Query\Criterion\CriterionProcessorInterface;
-
 use function Ibexa\PolyfillPhp82\iterator_to_array;
-
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
diff --git a/src/lib/Form/Factory/FormFactory.php b/src/lib/Form/Factory/FormFactory.php
index f6c6a954b7..c8e8cc3134 100644
--- a/src/lib/Form/Factory/FormFactory.php
+++ b/src/lib/Form/Factory/FormFactory.php
@@ -126,9 +126,7 @@
 use Ibexa\AdminUi\Form\Type\User\UserEditType;
 use Ibexa\AdminUi\Form\Type\Version\VersionRemoveType;
 use Ibexa\Bundle\Search\Form\Data\SearchData;
-
 use function is_string;
-
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Util\StringUtil;
diff --git a/src/lib/Tab/Dashboard/PagerLocationToDataMapper.php b/src/lib/Tab/Dashboard/PagerLocationToDataMapper.php
index 5eae20ecef..d179d598db 100644
--- a/src/lib/Tab/Dashboard/PagerLocationToDataMapper.php
+++ b/src/lib/Tab/Dashboard/PagerLocationToDataMapper.php
@@ -16,6 +16,7 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Language;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Ibexa\Core\Repository\LocationResolver\LocationResolver;
 use Pagerfanta\Pagerfanta;
@@ -50,11 +51,11 @@ public function __construct(
      *          'name': string,
      *          'type': ?string,
      *          'language': string,
-     *          'available_enabled_translations': \Ibexa\Contracts\Core\Repository\Values\Content\Language[],
-     *          'contributor': ?\Ibexa\Contracts\Core\Repository\Values\User\User,
-     *          'content_type': \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType,
+     *          'available_enabled_translations': Language[],
+     *          'contributor': ?User,
+     *          'content_type': ContentType,
      *          'modified': \DateTime,
-     *          'resolvedLocation': \Ibexa\Contracts\Core\Repository\Values\Content\Location
+     *          'resolvedLocation': Location
      *      }
      * >
      *
diff --git a/tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php b/tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php
index 8f6e7559ba..579f7343d5 100644
--- a/tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php
+++ b/tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php
@@ -66,7 +66,7 @@ public function testSupports(
     /**
      * @return iterable<array{
      *     bool,
-     *     \Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata
+     *     ArgumentMetadata
      * }>
      */
     public function provideDataForTestSupports(): iterable
diff --git a/tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php b/tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php
index f27fbaf8f8..1b7e94a59e 100644
--- a/tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php
+++ b/tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php
@@ -162,7 +162,7 @@ private function createFieldDefinitionCollectionForMetaFieldDefinitionsData(): F
     /**
      * @param array<string, array{
      *     'identifier': string,
-     *     'defaultValue': ?\Ibexa\Contracts\Core\Repository\Values\ValueObject,
+     *     'defaultValue': ?ValueObject,
      *     'name': string,
      *     'position': int,
      * }> $fieldDefinitionsConfig
diff --git a/tests/lib/Form/DataTransformer/LanguageTransformerTest.php b/tests/lib/Form/DataTransformer/LanguageTransformerTest.php
index b57f16cd2f..1a9ab3ad67 100644
--- a/tests/lib/Form/DataTransformer/LanguageTransformerTest.php
+++ b/tests/lib/Form/DataTransformer/LanguageTransformerTest.php
@@ -103,7 +103,7 @@ public function testReverseTransformWithNotFoundException(): void
 
     /**
      * @return array<string, array{
-     *     \Ibexa\Contracts\Core\Repository\Values\Content\Language|null,
+     *     Language|null,
      *     string|null,
      * }>
      */
diff --git a/tests/lib/Permission/LimitationResolverTest.php b/tests/lib/Permission/LimitationResolverTest.php
index f9919bc1ae..66251364ae 100644
--- a/tests/lib/Permission/LimitationResolverTest.php
+++ b/tests/lib/Permission/LimitationResolverTest.php
@@ -91,10 +91,10 @@ public function testGetLanguageLimitations(
      *          name: string,
      *          hasAccess: bool,
      *     }>,
-     *     \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo,
-     *     \Ibexa\Contracts\Core\Repository\Values\Content\Location,
-     *     \Ibexa\Contracts\Core\Repository\Values\User\LookupLimitationResult,
-     *     iterable<\Ibexa\Contracts\Core\Repository\Values\Content\Language>
+     *     ContentInfo,
+     *     Location,
+     *     LookupLimitationResult,
+     *     iterable<Language>
      * }>
      */
     public function provideDataForTestGetLanguageLimitations(): iterable