diff --git a/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php b/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
index addcc53a3d..6b11b0a20f 100644
--- a/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
+++ b/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
@@ -381,7 +381,16 @@ public function provider() {
       $basic_html_test_case,
       [
         'expected_messages' => [
-          'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt;.',
+          'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt; &lt;img loading&gt;.',
+        ],
+        'expected_ckeditor5_settings' => [
+          'plugins' => [
+            'ckeditor5_sourceEditing' => [
+              'allowed_tags' => [
+                '<img loading>',
+              ],
+            ],
+          ],
         ],
       ]
     );
@@ -396,13 +405,13 @@ public function provider() {
           'plugins' => [
             'ckeditor5_sourceEditing' => [
               'allowed_tags' => [
-                '<img data-caption>',
+                '<img loading data-caption>',
               ],
             ],
           ],
         ],
         'expected_messages' => [
-          'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt; &lt;img data-caption&gt;.',
+          'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt; &lt;img loading data-caption&gt;.',
         ],
       ]);
 
@@ -416,13 +425,13 @@ public function provider() {
           'plugins' => [
             'ckeditor5_sourceEditing' => [
               'allowed_tags' => [
-                '<img data-align>',
+                '<img loading data-align>',
               ],
             ],
           ],
         ],
         'expected_messages' => [
-          'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt; &lt;img data-align&gt;.',
+          'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt; &lt;img loading data-align&gt;.',
         ],
       ]);
 
@@ -433,10 +442,10 @@ public function provider() {
         'toolbar' => $basic_html_test_case['expected_ckeditor5_settings']['toolbar'],
         'plugins' => [
           'ckeditor5_sourceEditing' => [
-            'allowed_tags' => array_values(array_diff(
+            'allowed_tags' => array_merge(array_values(array_diff(
               $basic_html_test_case['expected_ckeditor5_settings']['plugins']['ckeditor5_sourceEditing']['allowed_tags'],
               ['<h4 id>', '<h6 id>'],
-            )),
+            )), ['<img loading>']),
           ],
           'ckeditor5_heading' => [
             'enabled_headings' => [
@@ -452,7 +461,7 @@ public function provider() {
       'expected_fundamental_compatibility_violations' => $basic_html_test_case['expected_fundamental_compatibility_violations'],
       'expected_messages' => array_merge(
         $basic_html_test_case['expected_messages'],
-        ['This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h5 id&gt;.'],
+        ['This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h5 id&gt; &lt;img loading&gt;.'],
       ),
     ];
 
diff --git a/core/modules/editor/src/Plugin/Filter/EditorFileReference.php b/core/modules/editor/src/Plugin/Filter/EditorFileReference.php
index 8cb9aad2d6..d802d6e974 100644
--- a/core/modules/editor/src/Plugin/Filter/EditorFileReference.php
+++ b/core/modules/editor/src/Plugin/Filter/EditorFileReference.php
@@ -50,16 +50,14 @@ class EditorFileReference extends FilterBase implements ContainerFactoryPluginIn
    *   The plugin implementation definition.
    * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity repository.
-   * @param \Drupal\Core\Image\ImageFactory $image_factory
-   *   The image factory.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository, ImageFactory $image_factory = NULL) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository) {
     $this->entityRepository = $entity_repository;
-    if ($image_factory === NULL) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $image_factory argument is deprecated in drupal:9.1.0 and is required in drupal:10.0.0. See https://www.drupal.org/node/3173719', E_USER_DEPRECATED);
-      $image_factory = \Drupal::service('image.factory');
+    $parameters = func_get_args();
+    if (array_key_exists(4, $parameters) && $parameters[4] instanceof ImageFactory) {
+      @trigger_error('Calling ' . __METHOD__ . '() with the $image_factory argument is deprecated in drupal:9.4.0 and is removed in drupal:10.0.0. See https://www.drupal.org/node/3173719', E_USER_DEPRECATED);
+      $this->imageFactory = $parameters[4];
     }
-    $this->imageFactory = $image_factory;
     parent::__construct($configuration, $plugin_id, $plugin_definition);
   }
 
@@ -71,8 +69,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.repository'),
-      $container->get('image.factory')
+      $container->get('entity.repository')
     );
   }
 
@@ -95,25 +92,6 @@ public function process($text, $langcode) {
           $file = $this->entityRepository->loadEntityByUuid('file', $uuid);
           if ($file instanceof FileInterface) {
             $node->setAttribute('src', $file->createFileUrl());
-            if ($node->nodeName == 'img') {
-              // Without dimensions specified, layout shifts can occur,
-              // which are more noticeable on pages that take some time to load.
-              // As a result, only mark images as lazy load that have dimensions.
-              $image = $this->imageFactory->get($file->getFileUri());
-              $width = $image->getWidth();
-              $height = $image->getHeight();
-              if ($width !== NULL && $height !== NULL) {
-                if (!$node->hasAttribute('width')) {
-                  $node->setAttribute('width', $width);
-                }
-                if (!$node->hasAttribute('height')) {
-                  $node->setAttribute('height', $height);
-                }
-                if (!$node->hasAttribute('loading')) {
-                  $node->setAttribute('loading', 'lazy');
-                }
-              }
-            }
           }
         }
 
diff --git a/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php b/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
index 19877a6fa9..2894c4524d 100644
--- a/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
+++ b/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\editor\Kernel;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\File\FileSystemInterface;
 use Drupal\file\Entity\File;
 use Drupal\filter\FilterPluginCollection;
 use Drupal\KernelTests\KernelTestBase;
@@ -129,28 +128,6 @@ public function testEditorFileReferenceFilter() {
     $output = $test($input);
     $this->assertSame($expected_output, $output->getProcessedText());
     $this->assertEquals($cache_tag, $output->getCacheTags());
-
-    // Add a valid image for test lazy loading feature.
-    /** @var array stdClass */
-    $files = $this->getTestFiles('image');
-    $image = reset($files);
-    \Drupal::service('file_system')->copy($image->uri, 'public://llama.jpg', FileSystemInterface::EXISTS_REPLACE);
-    [$width, $height] = getimagesize('public://llama.jpg');
-    $dimensions = 'width="' . $width . '" height="' . $height . '"';
-
-    // Image dimensions and loading attributes are present.
-    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
-    $expected_output = '<img src="/' . $this->siteDirectory . '/files/llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" ' . $dimensions . ' loading="lazy" />';
-    $output = $test($input);
-    $this->assertSame($expected_output, $output->getProcessedText());
-    $this->assertEquals($cache_tag, $output->getCacheTags());
-
-    // Image dimensions and loading attributes are set manually.
-    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '"width="41" height="21" loading="eager" />';
-    $expected_output = '<img src="/' . $this->siteDirectory . '/files/llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" width="41" height="21" loading="eager" />';
-    $output = $test($input);
-    $this->assertSame($expected_output, $output->getProcessedText());
-    $this->assertEquals($cache_tag, $output->getCacheTags());
   }
 
 }
diff --git a/core/modules/filter/src/Plugin/Filter/FilterImageLazyLoad.php b/core/modules/filter/src/Plugin/Filter/FilterImageLazyLoad.php
new file mode 100644
index 0000000000..608fc850d0
--- /dev/null
+++ b/core/modules/filter/src/Plugin/Filter/FilterImageLazyLoad.php
@@ -0,0 +1,124 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\filter\Plugin\Filter;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\file\FileInterface;
+use Drupal\filter\FilterProcessResult;
+use Drupal\filter\Plugin\FilterBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a filter to lazy load tracked images.
+ *
+ * @Filter(
+ *   id = "filter_image_lazy_load",
+ *   title = @Translation("Lazy load tracked images uploaded via a Text Editor"),
+ *   description = @Translation("Instruct browsers to lazy load images, unless overridden by <code>&lt;img loading=&quot;eager&quot;&gt;</code>."),
+ *   type = Drupal\filter\Plugin\FilterInterface::TYPE_TRANSFORM_REVERSIBLE,
+ *   weight = 15
+ * )
+ */
+final class FilterImageLazyLoad extends FilterBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The entity repository.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
+  /**
+   * The image factory.
+   *
+   * @var \Drupal\Core\Image\ImageFactory
+   */
+  protected $imageFactory;
+
+  /**
+   * Constructs a \Drupal\filter\Plugin\Filter\FilterImageLazyLoad object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository.
+   * @param \Drupal\Core\Image\ImageFactory $image_factory
+   *   The image factory.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository, ImageFactory $image_factory) {
+    $this->entityRepository = $entity_repository;
+    $this->imageFactory = $image_factory;
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+  }
+
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition): self {
+    return new self(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity.repository'),
+      $container->get('image.factory')
+    );
+
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process($text, $langcode): FilterProcessResult {
+    $result = new FilterProcessResult($text);
+
+    // If there are no images, exit early.
+    if (stripos($text, '<img ') === FALSE && stripos($text, 'data-entity-type="file"') === FALSE) {
+      return $result;
+    }
+
+    return $result->setProcessedText($this->transformImages($text));
+  }
+
+  /**
+   * Transform markup of images to include loading="lazy".
+   *
+   * @param string $text
+   *   The markup to transform.
+   *
+   * @return string
+   */
+  private function transformImages(string $text): string {
+    $dom = Html::load($text);
+    $xpath = new \DOMXPath($dom);
+    // Only set loading="lazy" if no existing loading attribute is specified.
+    foreach ($xpath->query('//img[not(@loading) and @data-entity-type="file" and @data-entity-uuid]') as $element) {
+      assert($element instanceof \DOMElement);
+      $uuid = $element->getAttribute('data-entity-uuid');
+      $file = $this->entityRepository->loadEntityByUuid('file', $uuid);
+      if ($file instanceof FileInterface) {
+        $image = $this->imageFactory->get($file->getFileUri());
+        $width = $image->getWidth();
+        $height = $image->getHeight();
+        // Set dimensions to avoid content layout shift (CLS).
+        if ($width !== NULL && !$element->hasAttribute('width')) {
+          $element->setAttribute('width', (string) $width);
+        }
+        if ($height !== NULL && !$element->hasAttribute('height')) {
+          $element->setAttribute('height', (string) $height);
+        }
+        // If dimensions are specified, then set lazy loading.
+        if ($element->hasAttribute('width') && $element->hasAttribute('height')) {
+          $element->setAttribute('loading', 'lazy');
+        }
+      }
+    }
+    return Html::serialize($dom);
+  }
+
+}
diff --git a/core/modules/filter/tests/src/Unit/FilterImageLazyLoadTest.php b/core/modules/filter/tests/src/Unit/FilterImageLazyLoadTest.php
new file mode 100644
index 0000000000..b3c5191676
--- /dev/null
+++ b/core/modules/filter/tests/src/Unit/FilterImageLazyLoadTest.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\Tests\filter\Unit;
+
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Image\Image;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\file\FileInterface;
+use Drupal\filter\Plugin\Filter\FilterImageLazyLoad;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\filter\Plugin\Filter\FilterImageLazyLoad
+ * @group filter
+ */
+final class FilterImageLazyLoadTest extends UnitTestCase {
+
+  /**
+   * @var \Drupal\filter\Plugin\Filter\FilterImageLazyLoad
+   */
+  protected $filter;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    $file = $this->prophesize(FileInterface::class);
+    $file->getFileUri()->willReturn('foo.png');
+    $entity_repository = $this->prophesize(EntityRepositoryInterface::class);
+    $entity_repository->loadEntityByUuid('file', 'a6d88b01-3b5e-4c02-bf26-24a0c48d61cd')->willReturn($file->reveal());
+    $image = $this->prophesize(Image::class);
+    $image->getHeight()->willReturn(100);
+    $image->getWidth()->willReturn(100);
+    $image_factory = $this->prophesize(ImageFactory::class);
+    $image_factory->get('foo.png')->willReturn($image->reveal());
+    $this->filter = new FilterImageLazyLoad([], 'filter_image_lazy_load', ['provider' => 'test'], $entity_repository->reveal(), $image_factory->reveal());
+    parent::setUp();
+  }
+
+  /**
+   * @covers ::process
+   *
+   * @dataProvider providerHtml
+   *
+   * @param string $html
+   *   Input HTML.
+   * @param string $expected
+   *   The expected output string.
+   */
+  public function testProcess(string $html, string $expected): void {
+    $this->assertSame($expected, $this->filter->process($html, 'en')->getProcessedText());
+  }
+
+  /**
+   * Provides data for testProcess.
+   *
+   * @return array
+   *   An array of test data.
+   */
+  public function providerHtml(): array {
+    return [
+      'lazy loading attribute already added' => ['<p><img src="foo.png" loading="lazy"></p>', '<p><img src="foo.png" loading="lazy" /></p>'],
+      'eager loading attribute already added' => ['<p><img src="foo.png" loading="eager"/></p>', '<p><img src="foo.png" loading="eager" /></p>'],
+      'no image tag' => ['<p>Lorem ipsum...</p>', '<p>Lorem ipsum...</p>'],
+      'no loading attribute nor uuid' => ['<p><img src="foo.png"></p>', '<p><img src="foo.png" /></p>'],
+      'no loading attribute but uuid' => ['<p><img src="foo.png" data-entity-type="file" data-entity-uuid="a6d88b01-3b5e-4c02-bf26-24a0c48d61cd"></p>', '<p><img src="foo.png" data-entity-type="file" data-entity-uuid="a6d88b01-3b5e-4c02-bf26-24a0c48d61cd" width="100" height="100" loading="lazy" /></p>'],
+    ];
+  }
+
+}
diff --git a/core/profiles/demo_umami/config/install/filter.format.basic_html.yml b/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
index 6e647a233a..5ff8381623 100644
--- a/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
+++ b/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
@@ -16,7 +16,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title>'
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt loading height width data-entity-type data-entity-uuid data-align data-caption> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_align:
@@ -49,6 +49,12 @@ filters:
     status: true
     weight: 0
     settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: 10
+    settings: { }
   media_embed:
     id: media_embed
     provider: media
diff --git a/core/profiles/standard/config/install/filter.format.basic_html.yml b/core/profiles/standard/config/install/filter.format.basic_html.yml
index 92224c23cf..1b8a71358c 100644
--- a/core/profiles/standard/config/install/filter.format.basic_html.yml
+++ b/core/profiles/standard/config/install/filter.format.basic_html.yml
@@ -15,7 +15,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption>'
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt loading height width data-entity-type data-entity-uuid data-align data-caption>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_align:
@@ -36,6 +36,12 @@ filters:
     status: true
     weight: 9
     settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: 15
+    settings: {  }
   editor_file_reference:
     id: editor_file_reference
     provider: editor
diff --git a/core/profiles/standard/config/install/filter.format.full_html.yml b/core/profiles/standard/config/install/filter.format.full_html.yml
index 8aca83e0d9..3a586cdd36 100644
--- a/core/profiles/standard/config/install/filter.format.full_html.yml
+++ b/core/profiles/standard/config/install/filter.format.full_html.yml
@@ -27,6 +27,12 @@ filters:
     status: true
     weight: 10
     settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: 15
+    settings: { }
   editor_file_reference:
     id: editor_file_reference
     provider: editor