diff --git a/CHANGELOG.md b/CHANGELOG.md
index 253a915..6913d91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Remove non-existing `description` in exception handling
+- Move Hyva dependency to separate package `yireo/magento2-webp2-for-hyva`
 
 ## [0.13.0] 
 ### Added
diff --git a/Observer/AddUrlWebpToGraphqlQuery.php b/Observer/AddUrlWebpToGraphqlQuery.php
deleted file mode 100644
index a22ba5e..0000000
--- a/Observer/AddUrlWebpToGraphqlQuery.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Yireo\Webp2\Observer;
-
-use Hyva\GraphqlViewModel\Model\GraphqlQueryEditor;
-use Magento\Framework\Event\Observer as Event;
-use Magento\Framework\Event\ObserverInterface;
-
-class AddUrlWebpToGraphqlQuery implements ObserverInterface
-{
-    /**
-     * @var GraphqlQueryEditor
-     */
-    private $queryEditor;
-
-    public function __construct(GraphqlQueryEditor $queryEditor)
-    {
-        $this->queryEditor = $queryEditor;
-    }
-
-    // @todo: Create an integration test for this
-    public function execute(Event $event)
-    {
-        $query = $event->getData('gql_container')->getData('query');
-        $linkType  = $event->getData('type');
-        $path  = ['products', 'items', ($linkType ? "{$linkType}_products" : 'products'), 'small_image'];
-
-        $updatedQuery = $this->queryEditor->addFieldIn($query, $path, 'url_webp');
-
-        $event->getData('gql_container')->setData('query', $updatedQuery);
-    }
-}
diff --git a/composer.json b/composer.json
index 351f974..de6b81b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "yireo/magento2-webp2",
   "license": "OSL-3.0",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "type": "magento2-module",
   "homepage": "https://www.yireo.com/software/magento-extensions/webp2",
   "description": "Magento 2 module to add WebP support to the Magento frontend",
@@ -38,6 +38,9 @@
     "bitexpert/phpstan-magento": "^0.3.0",
     "yireo/magento2-integration-test-helper": "^0.0.8"
   },
+  "suggest": {
+    "yireo/magento2-webp2-for-hyva": "Additional fixes with Yireo Webp2 for Hyva"
+  },
   "autoload": {
     "psr-4": {
       "Yireo\\Webp2\\": ""
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
deleted file mode 100644
index dc954d9..0000000
--- a/etc/frontend/events.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="hyva_graphql_render_before_slider_products_query">
-        <observer name="Yireo_Webp2::addUrlWebpToGraphqlQuery" instance="Yireo\Webp2\Observer\AddUrlWebpToGraphqlQuery"/>
-    </event>
-</config>