diff --git a/Block/QuickPay.php b/Block/QuickPay.php
new file mode 100644
index 0000000..cfcc4c9
--- /dev/null
+++ b/Block/QuickPay.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace QuickPay\Gateway\Block;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use QuickPay\Gateway\Model\Ui\ConfigProvider;
+
+class QuickPay extends Template
+{
+    /**
+     * @var ConfigProvider
+     */
+    protected $configProvider;
+
+    /**
+     * QuickPay constructor.
+     *
+     * @param Context $context
+     * @param ConfigProvider $configProvider
+     */
+    public function __construct(
+        Context $context,
+        ConfigProvider $configProvider,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->configProvider = $configProvider;
+    }
+
+    /**
+     * Return payment logo, label, and description based on selected payment method
+     *
+     * @param string $methodCode
+     * @return array
+     */
+    public function getPaymentConfigByMethod(string $methodCode)
+    {
+        $config = $this->configProvider->getConfig();
+        $methodConfig = $config['payment'][$methodCode] ?? null;
+
+        return [
+            'paymentLogo' => $methodConfig['paymentLogo'] ?? [],
+            'description' => $this->configProvider->getDescription($methodCode),
+            'label'       => $methodCode
+        ];
+    }
+}
diff --git a/Plugin/Hyva/Checkout/MethodListPlugin.php b/Plugin/Hyva/Checkout/MethodListPlugin.php
deleted file mode 100644
index a197f8c..0000000
--- a/Plugin/Hyva/Checkout/MethodListPlugin.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * QuickPay Gateway - Hyva Checkout MethodList Plugin
- * Automatically adds metadata from ConfigProvider to Hyva checkout payment methods
- * Works with and without Hyva installation
- */
-
-declare(strict_types=1);
-
-namespace QuickPay\Gateway\Plugin\Hyva\Checkout;
-
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\View\Element\Template;
-use Magento\Quote\Api\Data\PaymentMethodInterface;
-use QuickPay\Gateway\Model\Ui\ConfigProvider;
-use Psr\Log\LoggerInterface;
-
-class MethodListPlugin
-{
-    private $configProvider;
-    private $methodMetaDataFactory;
-    private $logger;
-
-    public function __construct(
-        ConfigProvider $configProvider,
-        LoggerInterface $logger,
-        $methodMetaDataFactory = null
-    ) {
-        $this->configProvider = $configProvider;
-        $this->methodMetaDataFactory = $methodMetaDataFactory;
-        $this->logger = $logger;
-    }
-
-    /**
-     * After getting method metadata, add QuickPay specific data from ConfigProvider
-     */
-    public function afterGetMethodMetaData(
-        $subject,
-        $result,
-        Template $parent,
-        PaymentMethodInterface $method
-    ) {
-        // Check if Hyva classes are available
-        if (!interface_exists('Hyva\Checkout\Model\MethodMetaDataInterface') || 
-            !class_exists('Hyva\Checkout\Model\MethodMetaDataFactory')) {
-            return $result;
-        }
-        $methodCode = $method->getCode();
-
-        // Check if it's a QuickPay payment method
-        if (strpos($methodCode, 'quickpay') === 0) {
-            try {
-                $config = $this->configProvider->getConfig();
-                $paymentConfig = $config['payment'][$methodCode] ?? [];
-
-                // Add icon data if available (use paymentLogo for both Luma and Hyva compatibility)
-                if (isset($paymentConfig['paymentLogoPath']) && is_array($paymentConfig['paymentLogoPath'])) {
-                    if (!empty($paymentConfig['paymentLogoPath'])) {
-                        // Use only the first logo (Hyva checkout limitation)
-                        $firstLogo = $paymentConfig['paymentLogoPath'][0];
-
-                        $iconData = [
-                            'src' => $firstLogo,
-                            'attributes' => [
-                                'width' => '60',
-                                'height' => '',
-                                'alt' => $methodCode
-                            ]
-                        ];
-
-                        $result->setData('icon', $iconData);
-                    }
-                }
-
-                // Add description as subtitle if available
-                if (isset($paymentConfig['description']) && !empty($paymentConfig['description'])) {
-                    $result->setData('subtitle', $paymentConfig['description']);
-                }
-            } catch (\Exception $e) {
-                $this->logger->error('QuickPay MethodListPlugin: Error processing ' . $methodCode, ['exception' => $e]);
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 5f5e28c..50789ae 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -27,14 +27,4 @@
                 type="QuickPay\Gateway\Plugin\Hyva\Checkout\PlaceOrderServiceProcessorPlugin"
                 sortOrder="10"/>
     </type>
-
-    
-    <!-- Plugin to add QuickPay metadata to Hyva checkout payment methods -->
-    <type name="Hyva\Checkout\ViewModel\Checkout\Payment\MethodList">
-        <plugin name="quickpay_hyva_checkout_metadata"
-                type="QuickPay\Gateway\Plugin\Hyva\Checkout\MethodListPlugin"
-                sortOrder="10"/>
-    </type>
-
-    
-</config>
\ No newline at end of file
+</config>
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
new file mode 100644
index 0000000..73f4cec
--- /dev/null
+++ b/view/frontend/layout/hyva_checkout_components.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="checkout.payment.methods">
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_gateway" as="quickpay_gateway" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_gateway</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_klarna" as="quickpay_klarna" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_klarna</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_applepay" as="quickpay_applepay" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_applepay</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_mobilepay" as="quickpay_mobilepay" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_mobilepay</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_vipps" as="quickpay_vipps" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_vipps</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_paypal" as="quickpay_paypal" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_paypal</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_viabill" as="quickpay_viabill" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_viabill</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_swish" as="quickpay_swish" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_swish</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_trustly" as="quickpay_trustly" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_trustly</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_anyday" as="quickpay_anyday" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_anyday</argument>
+                </arguments>
+            </block>
+            <block class="QuickPay\Gateway\Block\QuickPay" name="checkout.payment.method.quickpay_googlepay" as="quickpay_googlepay" template="QuickPay_Gateway::component/payment/method/quickpay.phtml">
+                <arguments>
+                    <argument name="method_code" xsi:type="string">quickpay_googlepay</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/templates/component/payment/method/quickpay.phtml b/view/frontend/templates/component/payment/method/quickpay.phtml
new file mode 100644
index 0000000..4e4aa61
--- /dev/null
+++ b/view/frontend/templates/component/payment/method/quickpay.phtml
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+use Magento\Framework\Escaper;
+use QuickPay\Gateway\Block\QuickPay;
+
+/** @var Escaper $escaper */
+/** @var QuickPay $block */
+
+$methodCode = $block->getMethodCode();
+$config = $block->getPaymentConfigByMethod($methodCode);
+
+$logos = $config['paymentLogo'] ?? [];
+$description = $config['description'] ?? '';
+$label = $config['label'] ?? '';
+?>
+
+<?php /* The wire Payment Method directive is required to sit in the root DOM element. */ ?>
+<div class="quickpay-method" data-method="<?= $escaper->escapeHtmlAttr($methodCode) ?>">
+    <?php if (!empty($logos)): ?>
+        <div class="quickpay-logos flex flex-wrap items-center gap-1.5">
+            <?php foreach ($logos as $logo): ?>
+                <img src="<?= $escaper->escapeUrl($logo) ?>" alt="<?= $escaper->escapeHtmlAttr($label) ?>" width="50" height="33" />
+            <?php endforeach; ?>
+        </div>
+    <?php endif; ?>
+    <?php if ($description): ?>
+        <div class="quickpay-description mt-3 p-4 mb-1 bg-gray-100 rounded-lg">
+            <?= $escaper->escapeHtml($description) ?>
+        </div>
+    <?php endif; ?>
+</div>