diff --git a/core/modules/media_library/media_library.services.yml b/core/modules/media_library/media_library.services.yml
index 57dd20ee55903ff132e7337f8b827732b38f8275..9a0253f15798a664b5d1778c91f3cd8a1b2c76b4 100644
--- a/core/modules/media_library/media_library.services.yml
+++ b/core/modules/media_library/media_library.services.yml
@@ -9,8 +9,8 @@ services:
     class: Drupal\media_library\Routing\RouteSubscriber
   media_library.opener_resolver:
     class: Drupal\media_library\OpenerResolver
-    calls:
-      - [setContainer, ['@service_container']]
+    tags:
+      - { name: service_collector, tag: media_library.opener, call: addOpener }
   Drupal\media_library\OpenerResolverInterface: '@media_library.opener_resolver'
   media_library.opener.field_widget:
     class: Drupal\media_library\MediaLibraryFieldWidgetOpener
diff --git a/core/modules/media_library/src/MediaLibraryServiceProvider.php b/core/modules/media_library/src/MediaLibraryServiceProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..19018e8c68cd0ec3c4882e7cd9bccaba8048d34c
--- /dev/null
+++ b/core/modules/media_library/src/MediaLibraryServiceProvider.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\media_library;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\DependencyInjection\ServiceProviderInterface;
+
+/**
+ * Service provider for media library services.
+ */
+class MediaLibraryServiceProvider implements ServiceProviderInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    $container->registerForAutoconfiguration(MediaLibraryOpenerInterface::class)
+      ->addTag('media_library.opener');
+  }
+
+}
diff --git a/core/modules/media_library/src/OpenerResolver.php b/core/modules/media_library/src/OpenerResolver.php
index c164544aaedc89c419136e9533cca027ccee8cb0..5920e572daf443ae79beeefa233d216bf785c80a 100644
--- a/core/modules/media_library/src/OpenerResolver.php
+++ b/core/modules/media_library/src/OpenerResolver.php
@@ -2,10 +2,8 @@
 
 namespace Drupal\media_library;
 
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
 /**
- * Defines a class to get media library openers from the container.
+ * Defines a class to resolve media library openers.
  *
  * This is intended to be a very thin interface-verifying wrapper around
  * services which implement \Drupal\media_library\MediaLibraryOpenerInterface.
@@ -18,7 +16,22 @@
  */
 class OpenerResolver implements OpenerResolverInterface {
 
-  use ContainerAwareTrait;
+  /**
+   * @var \Drupal\media_library\MediaLibraryOpenerInterface[]
+   */
+  protected array $openers = [];
+
+  /**
+   * Registers an opener.
+   *
+   * @param \Drupal\media_library\MediaLibraryOpenerInterface $opener
+   *   The opener.
+   * @param string $id
+   *   The service ID.
+   */
+  public function addOpener(MediaLibraryOpenerInterface $opener, string $id): void {
+    $this->openers[$id] = $opener;
+  }
 
   /**
    * {@inheritdoc}
@@ -26,7 +39,7 @@ class OpenerResolver implements OpenerResolverInterface {
   public function get(MediaLibraryState $state) {
     $service_id = $state->getOpenerId();
 
-    $service = $this->container->get($service_id);
+    $service = $this->openers[$service_id] ?? NULL;
     if ($service instanceof MediaLibraryOpenerInterface) {
       return $service;
     }
diff --git a/core/modules/media_library/tests/src/Kernel/MediaLibraryAddFormTest.php b/core/modules/media_library/tests/src/Kernel/MediaLibraryAddFormTest.php
index c4b258813c1c92b4ad4c54fb6e3b9451bb179f2a..24455679b683620df2119caf8643fe20a0ccff7b 100644
--- a/core/modules/media_library/tests/src/Kernel/MediaLibraryAddFormTest.php
+++ b/core/modules/media_library/tests/src/Kernel/MediaLibraryAddFormTest.php
@@ -29,6 +29,7 @@ class MediaLibraryAddFormTest extends KernelTestBase {
     'media_library',
     'file',
     'field',
+    'filter',
     'image',
     'system',
     'views',
diff --git a/core/modules/media_library/tests/src/Kernel/MediaLibraryWidgetTest.php b/core/modules/media_library/tests/src/Kernel/MediaLibraryWidgetTest.php
index 1da7afbcc20e51056abf62ddcb046a3f66d4bfcb..352f5ee964cbf63380e4afd9c4a5edc9f3f0f019 100644
--- a/core/modules/media_library/tests/src/Kernel/MediaLibraryWidgetTest.php
+++ b/core/modules/media_library/tests/src/Kernel/MediaLibraryWidgetTest.php
@@ -29,6 +29,7 @@ class MediaLibraryWidgetTest extends KernelTestBase {
     'media',
     'media_library',
     'field',
+    'filter',
     'image',
     'system',
     'views',
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 0037711f1db5435b4913e17985ec2e8c138dbb53..e1fb656004018b71572949da10e4e3773da4596f 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -1161,14 +1161,6 @@ parameters:
 			count: 1
 			path: modules/media/src/OEmbed/UrlResolver.php
 
-		-
-			message: """
-				#^Usage of deprecated trait Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareTrait in class Drupal\\\\media_library\\\\OpenerResolver\\:
-				since Symfony 6\\.4, use dependency injection instead$#
-			"""
-			count: 1
-			path: modules/media_library/src/OpenerResolver.php
-
 		-
 			message: "#^Variable \\$jpg_image might not be defined\\.$#"
 			count: 1