diff --git a/Test/Integration/Configuration/PaymentXmlTest.php b/Test/Integration/Configuration/PaymentXmlTest.php
index 9fec513..a2b886b 100644
--- a/Test/Integration/Configuration/PaymentXmlTest.php
+++ b/Test/Integration/Configuration/PaymentXmlTest.php
@@ -1,9 +1,7 @@
 <?php
 /*
- *
- *  * Copyright Magmodules.eu. All rights reserved.
- *  * See COPYING.txt for license details.
- *
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 declare(strict_types=1);
@@ -35,6 +33,7 @@ function (string $code) {
                         'mollie_methods_klarnapaynow',
                         'mollie_methods_klarnasliceit',
                         'mollie_methods_pointofsale',
+                        'mollie_methods_riverty',
                     ]
                 );
             }
diff --git a/composer.json b/composer.json
index 8c37e01..2bc3d4e 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,6 @@
     "creditcard",
     "directdebit",
     "eps",
-    "giropay",
     "gift cards",
     "ideal",
     "kbc",
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 57193d6..4035ef3 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -19,7 +19,6 @@
                 <item name="mollie_methods_directdebit" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_eps" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_giftcard" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
-                <item name="mollie_methods_giropay" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_ideal" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_in3" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_kbc" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
@@ -33,7 +32,9 @@
                 <item name="mollie_methods_paysafecard" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_pointofsale" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_przelewy24" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
+                <item name="mollie_methods_riverty" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_sofort" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
+                <item name="mollie_methods_trustly" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_twint" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
                 <item name="mollie_methods_voucher" xsi:type="string">Mollie\Multishipping\PlaceOrder</item>
             </argument>
diff --git a/etc/payment.xml b/etc/payment.xml
index cf4076a..9eab31b 100644
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -41,9 +41,6 @@
         <method name="mollie_methods_giftcard">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
-        <method name="mollie_methods_giropay">
-            <allow_multiple_address>1</allow_multiple_address>
-        </method>
         <method name="mollie_methods_ideal">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
@@ -62,9 +59,15 @@
         <method name="mollie_methods_przelewy24">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="mollie_methods_riverty">
+            <allow_multiple_address>0</allow_multiple_address>
+        </method>
         <method name="mollie_methods_sofort">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="mollie_methods_trustly">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
         <method name="mollie_methods_twint">
             <allow_multiple_address>1</allow_multiple_address>
         </method>