diff --git a/src/lib/Configuration/Provider/AlloyEditor.php b/src/lib/Configuration/Provider/AlloyEditor.php
index 4cddd9ee..d9b2bba5 100644
--- a/src/lib/Configuration/Provider/AlloyEditor.php
+++ b/src/lib/Configuration/Provider/AlloyEditor.php
@@ -9,8 +9,8 @@
 namespace Ibexa\FieldTypeRichText\Configuration\Provider;
 
 use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType\RichText;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\Configuration\UI\Mapper\OnlineEditorConfigMapper;
 
 /**
@@ -23,7 +23,7 @@ final class AlloyEditor implements Provider
     /** @var array */
     private $alloyEditorConfiguration;
 
-    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
+    /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
     private $configResolver;
 
     /** @var \Ibexa\FieldTypeRichText\Configuration\UI\Mapper\OnlineEditorConfigMapper */
diff --git a/src/lib/Configuration/Provider/CKEditor.php b/src/lib/Configuration/Provider/CKEditor.php
index ee4fae99..d7382b22 100644
--- a/src/lib/Configuration/Provider/CKEditor.php
+++ b/src/lib/Configuration/Provider/CKEditor.php
@@ -9,8 +9,8 @@
 namespace Ibexa\FieldTypeRichText\Configuration\Provider;
 
 use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType\RichText;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 
 /**
  * CKEditor configuration provider.
@@ -22,7 +22,7 @@ final class CKEditor implements Provider
     private const SEPARATOR = '|';
     private const CUSTOM_STYLE_INLINE = 'ibexaCustomStyleInline';
 
-    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
+    /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
     private $configResolver;
 
     /** @var array */
diff --git a/src/lib/Configuration/Provider/CustomStyle.php b/src/lib/Configuration/Provider/CustomStyle.php
index c47d5a5d..d3707b42 100644
--- a/src/lib/Configuration/Provider/CustomStyle.php
+++ b/src/lib/Configuration/Provider/CustomStyle.php
@@ -8,8 +8,8 @@
 
 namespace Ibexa\FieldTypeRichText\Configuration\Provider;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\Configuration\UI\Mapper\CustomTemplateConfigMapper;
 
 /**
@@ -19,7 +19,7 @@
  */
 final class CustomStyle implements Provider
 {
-    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
+    /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
     private $configResolver;
 
     /** @var \Ibexa\FieldTypeRichText\Configuration\UI\Mapper\CustomStyle */
diff --git a/src/lib/Configuration/Provider/CustomTag.php b/src/lib/Configuration/Provider/CustomTag.php
index 5aeef04d..0962ce0d 100644
--- a/src/lib/Configuration/Provider/CustomTag.php
+++ b/src/lib/Configuration/Provider/CustomTag.php
@@ -8,8 +8,8 @@
 
 namespace Ibexa\FieldTypeRichText\Configuration\Provider;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\Configuration\UI\Mapper\CustomTemplateConfigMapper;
 
 /**
@@ -19,7 +19,7 @@
  */
 final class CustomTag implements Provider
 {
-    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
+    /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
     private $configResolver;
 
     /** @var \Ibexa\FieldTypeRichText\Configuration\UI\Mapper\CustomTag */
diff --git a/src/lib/RichText/Converter/Html5.php b/src/lib/RichText/Converter/Html5.php
index 11dc1033..07e1bafa 100644
--- a/src/lib/RichText/Converter/Html5.php
+++ b/src/lib/RichText/Converter/Html5.php
@@ -8,7 +8,7 @@
 
 namespace Ibexa\FieldTypeRichText\RichText\Converter;
 
-use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\RichText\Converter\Xslt as XsltConverter;
 
 /**
diff --git a/src/lib/RichText/Converter/Html5Edit.php b/src/lib/RichText/Converter/Html5Edit.php
index bd739aac..b71ec663 100644
--- a/src/lib/RichText/Converter/Html5Edit.php
+++ b/src/lib/RichText/Converter/Html5Edit.php
@@ -8,7 +8,7 @@
 
 namespace Ibexa\FieldTypeRichText\RichText\Converter;
 
-use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\RichText\Converter\Xslt as XsltConverter;
 
 /**
diff --git a/src/lib/RichText/Converter/Html5Input.php b/src/lib/RichText/Converter/Html5Input.php
index fe8134ee..7eecbc64 100644
--- a/src/lib/RichText/Converter/Html5Input.php
+++ b/src/lib/RichText/Converter/Html5Input.php
@@ -8,7 +8,7 @@
 
 namespace Ibexa\FieldTypeRichText\RichText\Converter;
 
-use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\RichText\Converter\Xslt as XsltConverter;
 
 /**
diff --git a/src/lib/RichText/Renderer.php b/src/lib/RichText/Renderer.php
index 319abef2..206eb7bc 100644
--- a/src/lib/RichText/Renderer.php
+++ b/src/lib/RichText/Renderer.php
@@ -12,8 +12,8 @@
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Repository;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\RichText\RendererInterface;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute as AuthorizationAttribute;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -56,7 +56,7 @@ class Renderer implements RendererInterface
     protected $embedConfigurationNamespace;
 
     /**
-     * @var \Ibexa\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
      */
     protected $configResolver;
 
@@ -83,7 +83,7 @@ class Renderer implements RendererInterface
     /**
      * @param \Ibexa\Contracts\Core\Repository\Repository $repository
      * @param \Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface $authorizationChecker
-     * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver
+     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
      * @param \Twig\Environment $templateEngine
      * @param string $tagConfigurationNamespace
      * @param string $styleConfigurationNamespace
diff --git a/src/lib/Translation/Extractor/OnlineEditorCustomAttributesExtractor.php b/src/lib/Translation/Extractor/OnlineEditorCustomAttributesExtractor.php
index 78ee474a..63f64479 100644
--- a/src/lib/Translation/Extractor/OnlineEditorCustomAttributesExtractor.php
+++ b/src/lib/Translation/Extractor/OnlineEditorCustomAttributesExtractor.php
@@ -9,7 +9,7 @@
 namespace Ibexa\FieldTypeRichText\Translation\Extractor;
 
 use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType\RichText;
-use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use JMS\TranslationBundle\Model\Message\XliffMessage;
 use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\ExtractorInterface;
@@ -24,7 +24,7 @@ final class OnlineEditorCustomAttributesExtractor implements ExtractorInterface
     private const CLASS_LABEL_MESSAGE_ID = 'ezrichtext.classes.class.label';
 
     /**
-     * @var \Ibexa\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
      */
     private $configResolver;
 
@@ -34,7 +34,7 @@ final class OnlineEditorCustomAttributesExtractor implements ExtractorInterface
     private $siteAccessList;
 
     /**
-     * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver
+     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
      * @param string[] $siteAccessList
      */
     public function __construct(ConfigResolverInterface $configResolver, array $siteAccessList)
diff --git a/tests/lib/Configuration/Provider/AlloyEditorTest.php b/tests/lib/Configuration/Provider/AlloyEditorTest.php
index dd6359f7..0a1a3450 100644
--- a/tests/lib/Configuration/Provider/AlloyEditorTest.php
+++ b/tests/lib/Configuration/Provider/AlloyEditorTest.php
@@ -9,8 +9,8 @@
 namespace Ibexa\Tests\FieldTypeRichText\Configuration\Provider;
 
 use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType\RichText;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\Configuration\Provider\AlloyEditor;
 use Ibexa\FieldTypeRichText\Configuration\UI\Mapper\OnlineEditorConfigMapper;
 
diff --git a/tests/lib/Configuration/Provider/BaseProviderTestCase.php b/tests/lib/Configuration/Provider/BaseProviderTestCase.php
index 551f0e54..433a6f7f 100644
--- a/tests/lib/Configuration/Provider/BaseProviderTestCase.php
+++ b/tests/lib/Configuration/Provider/BaseProviderTestCase.php
@@ -8,13 +8,13 @@
 
 namespace Ibexa\Tests\FieldTypeRichText\Configuration\Provider;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use PHPUnit\Framework\TestCase;
 
 abstract class BaseProviderTestCase extends TestCase
 {
-    /** @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Core\MVC\ConfigResolverInterface */
+    /** @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
     protected $configResolver;
 
     public function setUp(): void
diff --git a/tests/lib/Configuration/Provider/CKEditorTest.php b/tests/lib/Configuration/Provider/CKEditorTest.php
index f7bca861..ab9439bc 100644
--- a/tests/lib/Configuration/Provider/CKEditorTest.php
+++ b/tests/lib/Configuration/Provider/CKEditorTest.php
@@ -9,8 +9,8 @@
 namespace Ibexa\Tests\FieldTypeRichText\Configuration\Provider;
 
 use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType\RichText;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\FieldTypeRichText\Configuration\Provider;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\FieldTypeRichText\Configuration\Provider\CKEditor;
 
 final class CKEditorTest extends BaseProviderTestCase
diff --git a/tests/lib/RichText/RendererTest.php b/tests/lib/RichText/RendererTest.php
index 8c5948a9..3d5b467a 100644
--- a/tests/lib/RichText/RendererTest.php
+++ b/tests/lib/RichText/RendererTest.php
@@ -12,8 +12,8 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Base\Exceptions\NotFoundException;
-use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Core\Repository\Repository;
 use Ibexa\FieldTypeRichText\RichText\Renderer;
 use PHPUnit\Framework\TestCase;