diff --git a/Plugin/OverrideProductImageTemplate.php b/Plugin/OverrideProductImageTemplate.php
deleted file mode 100644
index c30c0bc..0000000
--- a/Plugin/OverrideProductImageTemplate.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Fisheye Media Ltd. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-namespace Fisheye\Lazyload\Plugin;
-
-use Fisheye\Lazyload\Scope\Config;
-use Magento\Catalog\Block\Product\Image as ImageSubject;
-
-class OverrideProductImageTemplate
-{
-    /**
-     * @var Config
-     */
-    private $config;
-
-    public function __construct(Config $config)
-    {
-        $this->config = $config;
-    }
-
-    public function beforeSetTemplate(ImageSubject $subject, string $template): array
-    {
-        if ($this->config->isProductImageLazyloadingEnabled()) {
-            // Set template to Fisheye_Lazyload
-            $template = str_replace('Magento_Catalog', 'Fisheye_Lazyload', $template);
-        }
-        return [$template];
-    }
-}
diff --git a/README.md b/README.md
index 2808a23..72b1516 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ A Magento 2 module that adds support for lazy loading of images.
 
 ## Compatibility
 
-* Magento Community Edition / Enterprise Edition 2.2.x, 2.3.x, 2.4.x (see older releases for 2.0 / 2.1 support)
+* Magento Community Edition / Enterprise Edition 2.4.x (see older releases for 2.0 - 2.3 support)
 * Supports Magento 2 Full Page Cache (including Varnish)
 
 ## Installation
diff --git a/Scope/Config.php b/Scope/Config.php
index 700d041..8d3d6fa 100644
--- a/Scope/Config.php
+++ b/Scope/Config.php
@@ -11,7 +11,6 @@
 class Config
 {
     /** Stores configuration paths */
-    const XML_PATH_CATALOG_PRODUCT_IMAGE_LAZYLOAD_ENABLED = 'catalog/product_image_lazyload/enabled';
     const XML_PATH_CATALOG_IMAGE_PRELOAD_ENABLED = 'catalog/product_image_lazyload/preload';
 
     /**
@@ -24,18 +23,10 @@ public function __construct(ScopeConfigInterface $scopeConfig)
         $this->scopeConfig = $scopeConfig;
     }
 
-    public function isProductImageLazyloadingEnabled(): bool
-    {
-        return $this->scopeConfig->isSetFlag(
-            self::XML_PATH_CATALOG_PRODUCT_IMAGE_LAZYLOAD_ENABLED,
-            ScopeInterface::SCOPE_STORE
-        );
-    }
-
     public function isImagePreloadingEnabled(): bool
     {
         return $this->scopeConfig->isSetFlag(
-            self::XML_PATH_CATALOG_PRODUCT_IMAGE_LAZYLOAD_ENABLED,
+            self::XML_PATH_CATALOG_IMAGE_PRELOAD_ENABLED,
             ScopeInterface::SCOPE_STORE
         );
     }
diff --git a/composer.json b/composer.json
index c03df11..3b2dfe6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "fisheye/module-lazyload",
-    "type": "magento2-module",
     "description": "A Magento 2 module that adds support for lazy loading of images.",
     "license": "MIT",
+    "type": "magento2-module",
     "authors": [
         {
             "name": "Fisheye Media Ltd.",
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "magento/module-catalog": "^102.0 || ^103.0 || ^104.0"
+        "magento/module-catalog": "^104.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 578b9cf..ba6d411 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -16,17 +16,6 @@
                    showInWebsite="1"
                    showInStore="1">
                 <label>Image Lazyloading</label>
-                <field id="enabled"
-                       translate="label comment"
-                       type="select"
-                       sortOrder="1"
-                       showInDefault="1"
-                       showInWebsite="1"
-                       showInStore="1"
-                       canRestore="1">
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <label>Enable lazy loading of product images</label>
-                </field>
                 <field id="preload"
                        translate="label comment"
                        type="select"
diff --git a/etc/config.xml b/etc/config.xml
index d3e3997..9388380 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -10,7 +10,6 @@
     <default>
         <catalog>
             <product_image_lazyload>
-                <enabled>1</enabled>
                 <preload>1</preload>
             </product_image_lazyload>
         </catalog>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
deleted file mode 100644
index f8acaec..0000000
--- a/etc/frontend/di.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Fisheye Media Ltd. All rights reserved.
- * See LICENCE.txt for licence details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Catalog\Block\Product\Image">
-        <plugin name="lazyloadImages"
-                type="Fisheye\Lazyload\Plugin\OverrideProductImageTemplate"
-                sortOrder="10"/>
-    </type>
-</config>
diff --git a/etc/module.xml b/etc/module.xml
index 4ca8ab6..7975485 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -6,8 +6,8 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Fisheye_Lazyload" setup_version="1.0.0">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Fisheye_Lazyload">
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 2565bdb..8a2fe17 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -16,7 +16,7 @@
                 <arguments>
                     <!--
                      *  Item "name" attribute should be descriptive to the area
-                     *  Item value should be a CSS selector vage enough to select groups of elements for efficiency
+                     *  Item value should be a CSS selector vague enough to select groups of elements for efficiency
                      -->
                     <argument name="preload_elements" xsi:type="array">
                         <item name="header_images" xsi:type="string">header .lazyload</item>
diff --git a/view/frontend/layout/hyva_default.xml b/view/frontend/layout/hyva_default.xml
new file mode 100644
index 0000000..99849f9
--- /dev/null
+++ b/view/frontend/layout/hyva_default.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Fisheye Media Ltd. All rights reserved.
+ * See LICENCE.txt for licence details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <!--
+         Ideally we wouldn't use lazysizes here, and would rely on native loading features.
+         This is legacy support for existing sites that are expected to have content that uses older markup.
+         -->
+        <script src="Fisheye_Lazyload/js/lazysizes.min.js" async="async" />
+        <script src="Fisheye_Lazyload/js/ls.native-loading.min.js" async="async" />
+    </head>
+    <body>
+        <!-- Preloading feature not supported for Hyva themes -->
+        <referenceBlock name="lazyload.preload.config" remove="true"/>
+    </body>
+</page>
diff --git a/view/frontend/templates/product/image.phtml b/view/frontend/templates/product/image.phtml
deleted file mode 100644
index 72e6fae..0000000
--- a/view/frontend/templates/product/image.phtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Fisheye Media Ltd. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-/** @var Magento\Catalog\Block\Product\Image $block */
-/** @var Magento\Framework\Escaper $escaper */
-$label = $block->stripTags($block->getLabel(), null, true);
-$customAttributes = $block->getCustomAttributes();
-?>
-<img class="photo image lazyload <?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
-    loading="lazy"
-    <?php if (is_array($customAttributes)): ?>
-        <?php foreach ($block->getCustomAttributes() as $name => $value): ?>
-            <?= $escaper->escapeHtmlAttr($name) ?>="<?= $escaper->escapeHtml($value) ?>"
-        <?php endforeach; ?>
-    <?php else: ?>
-        <?= $block->escapeHtmlAttr($customAttributes) ?>
-    <?php endif; ?>
-    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
-    data-src="<?= $escaper->escapeUrl($block->getImageUrl()) ?>"
-    width="<?= $escaper->escapeHtmlAttr($block->getWidth()) ?>"
-    height="<?= $escaper->escapeHtmlAttr($block->getHeight()) ?>"
-    alt="<?= $escaper->escapeHtmlAttr($label) ?>" />
diff --git a/view/frontend/templates/product/image_with_borders.phtml b/view/frontend/templates/product/image_with_borders.phtml
deleted file mode 100644
index 333d994..0000000
--- a/view/frontend/templates/product/image_with_borders.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Fisheye Media Ltd. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-/** @var Magento\Catalog\Block\Product\Image $block */
-$label = $block->stripTags($block->getLabel(), null, true);
-$customAttributes = $block->getCustomAttributes();
-?>
-<span class="product-image-container"
-      style="width:<?= $block->escapeHtmlAttr($block->getWidth()) ?>px;">
-    <span class="product-image-wrapper"
-          style="padding-bottom: <?= $block->escapeHtmlAttr(($block->getRatio() * 100)) ?>%;">
-        <img class="product-image-photo lazyload <?= $block->escapeHtmlAttr($block->getClass()) ?>"
-            loading="lazy"
-            <?php if (is_array($customAttributes)): ?>
-                <?php foreach ($block->getCustomAttributes() as $name => $value): ?>
-                    <?= $escaper->escapeHtmlAttr($name) ?>="<?= $escaper->escapeHtml($value) ?>"
-                <?php endforeach; ?>
-            <?php else: ?>
-                <?= $block->escapeHtmlAttr($customAttributes) ?>
-            <?php endif; ?>
-            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
-            data-src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
-            max-width="<?= $block->escapeHtmlAttr($block->getWidth()) ?>"
-            max-height="<?= $block->escapeHtmlAttr($block->getHeight()) ?>"
-            alt="<?= $block->escapeHtmlAttr($label) ?>" />
-    </span>
-</span>