diff --git a/src/bundle/ApiLoader/BoostFactorProviderFactory.php b/src/bundle/ApiLoader/BoostFactorProviderFactory.php
index 8c74159d..8689ac85 100644
--- a/src/bundle/ApiLoader/BoostFactorProviderFactory.php
+++ b/src/bundle/ApiLoader/BoostFactorProviderFactory.php
@@ -7,7 +7,7 @@
 
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
-use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider;
+use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
 use Ibexa\Solr\FieldMapper\BoostFactorProvider;
 use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -21,7 +21,7 @@ class BoostFactorProviderFactory implements ContainerAwareInterface
     use ContainerAwareTrait;
 
     /**
-     * @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider
+     * @var \Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface
      */
     private $repositoryConfigurationProvider;
 
@@ -40,7 +40,7 @@ class BoostFactorProviderFactory implements ContainerAwareInterface
      * @param string $boostFactorProviderClass
      */
     public function __construct(
-        RepositoryConfigurationProvider $repositoryConfigurationProvider,
+        RepositoryConfigurationProviderInterface $repositoryConfigurationProvider,
         $defaultConnection,
         $boostFactorProviderClass
     ) {
diff --git a/src/bundle/ApiLoader/IndexingDepthProviderFactory.php b/src/bundle/ApiLoader/IndexingDepthProviderFactory.php
index 13843675..38db2c44 100644
--- a/src/bundle/ApiLoader/IndexingDepthProviderFactory.php
+++ b/src/bundle/ApiLoader/IndexingDepthProviderFactory.php
@@ -8,7 +8,7 @@
 
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
-use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider;
+use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
 use Ibexa\Solr\FieldMapper\IndexingDepthProvider;
 use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -19,7 +19,7 @@ class IndexingDepthProviderFactory implements ContainerAwareInterface
     use ContainerAwareTrait;
 
     /**
-     * @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider
+     * @var \Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface
      */
     private $repositoryConfigurationProvider;
 
@@ -34,7 +34,7 @@ class IndexingDepthProviderFactory implements ContainerAwareInterface
     private $indexingDepthProviderClass;
 
     public function __construct(
-        RepositoryConfigurationProvider $repositoryConfigurationProvider,
+        RepositoryConfigurationProviderInterface $repositoryConfigurationProvider,
         string $defaultConnection,
         string $indexingDepthProviderClass
     ) {
diff --git a/src/bundle/ApiLoader/SolrEngineFactory.php b/src/bundle/ApiLoader/SolrEngineFactory.php
index 7352e535..35de38fe 100644
--- a/src/bundle/ApiLoader/SolrEngineFactory.php
+++ b/src/bundle/ApiLoader/SolrEngineFactory.php
@@ -7,7 +7,7 @@
 
 namespace Ibexa\Bundle\Solr\ApiLoader;
 
-use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider;
+use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
 use Ibexa\Contracts\Core\Persistence\Content\Handler;
 use Ibexa\Contracts\Solr\DocumentMapper;
 use Ibexa\Solr\CoreFilter\CoreFilterRegistry;
@@ -16,7 +16,7 @@
 
 class SolrEngineFactory
 {
-    /** @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider */
+    /** @var \Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface */
     private $repositoryConfigurationProvider;
 
     /** @var string */
@@ -44,7 +44,7 @@ class SolrEngineFactory
     private $locationResultExtractor;
 
     public function __construct(
-        RepositoryConfigurationProvider $repositoryConfigurationProvider,
+        RepositoryConfigurationProviderInterface $repositoryConfigurationProvider,
         $defaultConnection,
         $searchEngineClass,
         GatewayRegistry $gatewayRegistry,