diff --git a/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-payment-method.plugin.js b/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-payment-method.plugin.js
index 5a4b6bfc7..e6bbdbcfa 100644
--- a/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-payment-method.plugin.js
+++ b/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-payment-method.plugin.js
@@ -1,4 +1,3 @@
-import HttpClient from '../services/HttpClient';
 import Plugin from '../Plugin';
 
 export default class MollieApplePayPaymentMethod extends Plugin {
@@ -8,10 +7,8 @@ export default class MollieApplePayPaymentMethod extends Plugin {
      */
     init() {
 
-        const me = this;
 
         const hideAlways = this.options.hideAlways;
-        const shopUrl = this.getShopUrl();
 
         // if we don't want to always hide it,
         // then only hide it, if Apple Pay is not active
diff --git a/src/Resources/views/storefront/component/buy-widget/buy-widget-form.html.twig b/src/Resources/views/storefront/component/buy-widget/buy-widget-form.html.twig
index fcb32f45e..44945671c 100644
--- a/src/Resources/views/storefront/component/buy-widget/buy-widget-form.html.twig
+++ b/src/Resources/views/storefront/component/buy-widget/buy-widget-form.html.twig
@@ -1,6 +1,6 @@
 {% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget-form.html.twig' %}
 
-{% block buy_widget_buy_container %}
+{% block buy_widget_buy_button %}
 
     {% if mollie_subscriptions_enabled and product.translated.customFields.mollie_payments_product_subscription_enabled %}
         <div class="d-grid">
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 47de70700..4b659058d 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -14,7 +14,6 @@
 use Kiener\MolliePayments\Handler\Method\CreditCardPayment;
 use Kiener\MolliePayments\Handler\Method\EpsPayment;
 use Kiener\MolliePayments\Handler\Method\GiftCardPayment;
-use Kiener\MolliePayments\Handler\Method\GiroPayPayment;
 use Kiener\MolliePayments\Handler\Method\iDealPayment;
 use Kiener\MolliePayments\Handler\Method\In3Payment;
 use Kiener\MolliePayments\Handler\Method\IngHomePayPayment;
@@ -124,11 +123,7 @@ public function installAndActivatePaymentMethods(Context $context): void
         # we still need the min the database
         # but always disable them :)
         $this->disablePaymentMethod(IngHomePayPayment::class, $context);
-        $this->disablePaymentMethod(GiroPayPayment::class, $context);
-        $this->disablePaymentMethod(KlarnaPayLaterPayment::class, $context);
-        $this->disablePaymentMethod(KlarnaPayNowPayment::class, $context);
-        $this->disablePaymentMethod(KlarnaSliceItPayment::class, $context);
-        $this->disablePaymentMethod(SofortPayment::class, $context);
+
         if (! $this->payPalExpressConfig->isEnabled()) {
             $this->disablePaymentMethod(PayPalExpressPayment::class, $context);
         }
@@ -444,14 +439,14 @@ public function getPaymentHandlers(): array
             GiftCardPayment::class,
             iDealPayment::class,
             KbcPayment::class,
-            // KlarnaPayLaterPayment::class,
-            // KlarnaPayNowPayment::class,
-            // KlarnaSliceItPayment::class,
+            KlarnaPayLaterPayment::class,
+            KlarnaPayNowPayment::class,
+            KlarnaSliceItPayment::class,
             KlarnaOnePayment::class,
             PayPalPayment::class,
             PaySafeCardPayment::class,
             Przelewy24Payment::class,
-            // SofortPayment::class,
+            SofortPayment::class,
             VoucherPayment::class,
             In3Payment::class,
             PosPayment::class,
diff --git a/tests/PHPUnit/Service/PaymentMethodServiceTest.php b/tests/PHPUnit/Service/PaymentMethodServiceTest.php
index 3d32a2720..8abbc8d15 100644
--- a/tests/PHPUnit/Service/PaymentMethodServiceTest.php
+++ b/tests/PHPUnit/Service/PaymentMethodServiceTest.php
@@ -127,10 +127,14 @@ public function testSupportedMethods(): void
             GiftCardPayment::class,
             iDealPayment::class,
             KbcPayment::class,
+            KlarnaPayLaterPayment::class,
+            KlarnaPayNowPayment::class,
+            KlarnaSliceItPayment::class,
             KlarnaOnePayment::class,
             PayPalPayment::class,
             PaySafeCardPayment::class,
             Przelewy24Payment::class,
+            SofortPayment::class,
             VoucherPayment::class,
             In3Payment::class,
             PosPayment::class,