diff --git a/Content/Application/PropertyResolver/MediaSelectionPropertyResolver.php b/Content/Application/PropertyResolver/MediaSelectionPropertyResolver.php
deleted file mode 100644
index ae244b49..00000000
--- a/Content/Application/PropertyResolver/MediaSelectionPropertyResolver.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of Sulu.
- *
- * (c) Sulu GmbH
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver;
-
-use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\MediaResourceLoader;
-
-class MediaSelectionPropertyResolver implements PropertyResolverInterface
-{
-    public function resolve(mixed $data, string $locale, array $params = []): ContentView
-    {
-        if (empty($data) || !\is_array($data) || !isset($data['ids'])) {
-            return ContentView::create([], ['ids' => []]);
-        }
-
-        /** @var string $resourceLoaderKey */
-        $resourceLoaderKey = $params['resourceLoader'] ?? MediaResourceLoader::getKey();
-
-        return ContentView::createResolvables(
-            $data['ids'],
-            $resourceLoaderKey,
-            ['ids' => $data['ids']],
-        );
-    }
-
-    public static function getType(): string
-    {
-        return 'media_selection';
-    }
-}
diff --git a/Content/Application/ResourceLoader/MediaResourceLoader.php b/Content/Application/ResourceLoader/MediaResourceLoader.php
deleted file mode 100644
index c7a12cd3..00000000
--- a/Content/Application/ResourceLoader/MediaResourceLoader.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of Sulu.
- *
- * (c) Sulu GmbH
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader;
-
-use Sulu\Bundle\MediaBundle\Media\Manager\MediaManagerInterface;
-
-class MediaResourceLoader implements ResourceLoaderInterface
-{
-    public const RESOURCE_LOADER_KEY = 'media';
-
-    public function __construct(
-        private MediaManagerInterface $mediaManager
-    ) {
-    }
-
-    public function load(array $ids, ?string $locale, array $params = []): array
-    {
-        $result = $this->mediaManager->getByIds($ids, (string) $locale);
-
-        $mappedResult = [];
-        foreach ($result as $media) {
-            $mappedResult[$media->getId()] = $media;
-        }
-
-        return $mappedResult;
-    }
-
-    public static function getKey(): string
-    {
-        return self::RESOURCE_LOADER_KEY;
-    }
-}
diff --git a/Resources/config/resolvers.xml b/Resources/config/resolvers.xml
index df57fce3..98449e11 100644
--- a/Resources/config/resolvers.xml
+++ b/Resources/config/resolvers.xml
@@ -59,18 +59,11 @@
             />
         </service>
 
-        <!-- TODO move to media bundle -->
-        <service id="sulu_content.property_resolver.media_selection"
-                 class="Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\MediaSelectionPropertyResolver">
-            <tag name="sulu_content.property_resolver"/>
-        </service>
-
         <service id="sulu_content.property_resolver.default"
                  class="Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver\DefaultPropertyResolver">
             <tag name="sulu_content.property_resolver"/>
         </service>
 
-        <!-- TODO move to admin bundle -->
         <service id="sulu_content.property_resolver.block"
                  class="Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver\BlockPropertyResolver">
             <call method="setMetadataResolver">
diff --git a/Resources/config/resource-loader.xml b/Resources/config/resource-loader.xml
index 854f0219..8de17770 100644
--- a/Resources/config/resource-loader.xml
+++ b/Resources/config/resource-loader.xml
@@ -13,13 +13,5 @@
                 index-by="type"
             />
         </service>
-
-        <!-- TODO move to media bundle -->
-        <service id="sulu_content.media_resource_loader"
-        class="Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\MediaResourceLoader">
-            <argument type="service" id="sulu_media.media_manager"/>
-
-            <tag name="sulu_content.resource_loader" type="media"/>
-        </service>
     </services>
 </container>
diff --git a/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php b/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php
index 6a3f08ae..b1762d15 100644
--- a/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php
+++ b/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php
@@ -15,9 +15,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\MediaResourceLoader;
 use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\ResourceLoaderInterface;
 use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\ResourceLoaderProvider;
+use Sulu\Bundle\MediaBundle\Infrastructure\Sulu\Content\ResourceLoader\MediaResourceLoader;
 
 class ResourceLoaderProviderTest extends TestCase
 {
@@ -25,6 +25,10 @@ class ResourceLoaderProviderTest extends TestCase
 
     public function testGetResourceLoader(): void
     {
+        if (!\class_exists(MediaResourceLoader::class)) {
+            $this->markTestSkipped('This test is skipped because the class "MediaResourceLoader" does not exist.');
+        }
+
         $mediaResourceLoader = $this->prophesize(MediaResourceLoader::class);
         $categoryResourceLoader = $this->prophesize(ResourceLoaderInterface::class);
         $resourceLoaderProvider = new ResourceLoaderProvider(
diff --git a/composer.json b/composer.json
index 32480e88..5af87b14 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,12 @@
     ],
     "homepage": "https://github.com/sulu/SuluContentBundle",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/Prokyonn/sulu.git"
+        }
+    ],
     "require": {
         "php": "^8.0",
         "doctrine/inflector": "^1.4.1 || ^2.0.1",
@@ -20,7 +26,7 @@
         "friendsofsymfony/rest-bundle": "^2.6 || ^3.0",
         "massive/search-bundle": "^2.4",
         "ramsey/uuid": "^3.8 || ^4.0",
-        "sulu/sulu": "^2.5.6 || ^2.6@dev",
+        "sulu/sulu": "dev-feature/content-resolver as 2.6",
         "symfony/config": "^5.4 || ^6.0 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
         "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",