diff --git a/Plugin/AddCspInlineScripts.php b/Plugin/AddCspInlineScripts.php
deleted file mode 100644
index 4498d23..0000000
--- a/Plugin/AddCspInlineScripts.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Yireo\NextGenImages\Plugin;
-
-use Magento\Framework\View\Element\Template;
-use Yireo\CspUtilities\Util\ReplaceInlineScripts;
-
-class AddCspInlineScripts
-{
-    private ReplaceInlineScripts $replaceInlineScripts;
-
-    public function __construct(
-        ReplaceInlineScripts $replaceInlineScripts
-    ) {
-        $this->replaceInlineScripts = $replaceInlineScripts;
-    }
-
-    public function afterToHtml(Template $block, $html): string
-    {
-        if (false === strstr((string)$block->getNameInLayout(), 'yireo_nextgenimages.')) {
-            return (string) $html;
-        }
-
-        return $this->replaceInlineScripts->replace((string)$html);
-    }
-}
diff --git a/composer.json b/composer.json
index 76b12e1..4289073 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
         "magento/module-store": "^100.0|^101.0",
         "magento/module-swatches": "^100.0",
         "magento/module-page-cache": "^100.0",
-        "yireo/magento2-csp-utilities": "^1.0",
         "psr/log": "^1 || ^2 || ^3",
         "php": ">=7.4.0",
         "ext-dom": "*",
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 5cbaf31..67bfd15 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -4,10 +4,6 @@
         <plugin name="Yireo_NextGenImages::replaceTagsInHtml" type="Yireo\NextGenImages\Plugin\ReplaceTagsInHtml"/>
     </type>
 
-    <type name="Magento\Framework\View\Element\Template">
-        <plugin name="Yireo_NextGenImages::addCspInlineScripts" type="Yireo\NextGenImages\Plugin\AddCspInlineScripts"/>
-    </type>
-
     <type name="Magento\Swatches\Helper\Data">
         <plugin name="Yireo_NextGenImages::correctImagesInAjaxResponse" type="Yireo\NextGenImages\Plugin\CorrectImagesInAjaxResponse"/>
     </type>
diff --git a/etc/module.xml b/etc/module.xml
index 7a806fe..aa77570 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -10,7 +10,6 @@
             <module name="Magento_PageCache"/>
             <module name="Magento_Store"/>
             <module name="Magento_Swatches"/>
-            <module name="Yireo_CspUtilities"/>
         </sequence>
     </module>
 </config>
diff --git a/view/frontend/layout/hyva_catalog_category_view.xml b/view/frontend/layout/hyva_catalog_category_view.xml
deleted file mode 100644
index 5956d84..0000000
--- a/view/frontend/layout/hyva_catalog_category_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="urn:magento:module:View/Layout:etc/page_configuration.xsd">
-    <body>
-        <referenceContainer name="content">
-            <block name="yireo_nextgenimages.category-additions"
-                   template="Yireo_NextGenImages::hyva/category-additions.phtml" />
-        </referenceContainer>
-    </body>
-</page>
diff --git a/view/frontend/templates/hyva/category-additions.phtml b/view/frontend/templates/hyva/category-additions.phtml
deleted file mode 100644
index f0b453d..0000000
--- a/view/frontend/templates/hyva/category-additions.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<script></script>
\ No newline at end of file
diff --git a/view/frontend/templates/hyva/gallery-additions.phtml b/view/frontend/templates/hyva/gallery-additions.phtml
index 4056d6c..ee4f874 100644
--- a/view/frontend/templates/hyva/gallery-additions.phtml
+++ b/view/frontend/templates/hyva/gallery-additions.phtml
@@ -1,8 +1,17 @@
-<script>
+<?php
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+$script = <<<JS
+    'use strict'
     document.addEventListener('alpine:init', () => {
         Alpine.data('initGallery', () => {
             const galleryInitData = initGallery();
             document.dispatchEvent(new CustomEvent('gallery-init', {detail: galleryInitData}));
             return galleryInitData;
         });
-    });</script>
\ No newline at end of file
+    });
+JS;
+
+echo $secureRenderer->renderTag('script', [], $script, false);
