diff --git a/src/Resources/config/app/config.yml b/src/Resources/config/app/config.yml
index 52f8d6c1c..d0deef25d 100644
--- a/src/Resources/config/app/config.yml
+++ b/src/Resources/config/app/config.yml
@@ -26,13 +26,6 @@ sylius_mailer:
             subject: Units refunded
             template: "@SyliusRefundPlugin/Email/unitsRefunded.html.twig"
 
-framework:
-    messenger:
-        buses:
-            sylius_refund_plugin.command_bus: ~
-            sylius_refund_plugin.event_bus:
-                default_middleware: allow_no_handlers
-
 winzou_state_machine:
     sylius_refund_refund_payment:
         class: Sylius\RefundPlugin\Entity\RefundPayment
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index b27801ca2..1995051fa 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -28,11 +28,11 @@
 
         <service id="Sylius\RefundPlugin\Refunder\OrderItemUnitsRefunder">
             <argument type="service" id="Sylius\RefundPlugin\Creator\RefundCreator" />
-            <argument type="service" id="sylius_refund_plugin.event_bus" />
+            <argument type="service" id="sylius_default.bus" />
         </service>
         <service id="Sylius\RefundPlugin\Refunder\OrderShipmentsRefunder">
             <argument type="service" id="Sylius\RefundPlugin\Creator\RefundCreator" />
-            <argument type="service" id="sylius_refund_plugin.event_bus" />
+            <argument type="service" id="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactory" />
diff --git a/src/Resources/config/services/actions.xml b/src/Resources/config/services/actions.xml
index 922b04e1e..1803fca4a 100644
--- a/src/Resources/config/services/actions.xml
+++ b/src/Resources/config/services/actions.xml
@@ -25,7 +25,7 @@
         </service>
 
         <service id="Sylius\RefundPlugin\Action\Admin\RefundUnitsAction">
-            <argument type="service" id="sylius_refund_plugin.command_bus" />
+            <argument type="service" id="sylius_default.bus" />
             <argument type="service" id="session" />
             <argument type="service" id="router" />
             <argument type="service" id="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreator" />
@@ -41,7 +41,7 @@
         </service>
 
         <service id="Sylius\RefundPlugin\Action\Admin\SendCreditMemoAction">
-            <argument type="service" id="sylius_refund_plugin.command_bus"/>
+            <argument type="service" id="sylius_default.bus"/>
             <argument type="service" id="sylius_refund.repository.credit_memo"/>
             <argument type="service" id="session"/>
             <argument type="service" id="router"/>
diff --git a/src/Resources/config/services/command_bus.xml b/src/Resources/config/services/command_bus.xml
index a47c54734..cb20421b6 100644
--- a/src/Resources/config/services/command_bus.xml
+++ b/src/Resources/config/services/command_bus.xml
@@ -7,24 +7,24 @@
         <service id="Sylius\RefundPlugin\CommandHandler\RefundUnitsHandler">
             <argument type="service" id="Sylius\RefundPlugin\Refunder\OrderItemUnitsRefunder" />
             <argument type="service" id="Sylius\RefundPlugin\Refunder\OrderShipmentsRefunder" />
-            <argument type="service" id="sylius_refund_plugin.event_bus" />
+            <argument type="service" id="sylius_default.bus" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidator" />
-            <tag name="messenger.message_handler" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\CommandHandler\GenerateCreditMemoHandler">
             <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoGenerator" />
             <argument type="service" id="sylius_refund.manager.credit_memo" />
-            <argument type="service" id="sylius_refund_plugin.event_bus" />
+            <argument type="service" id="sylius_default.bus" />
             <argument type="service" id="sylius.repository.order" />
-            <tag name="messenger.message_handler" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\CommandHandler\SendCreditMemoHandler" >
             <argument type="service" id="sylius_refund.repository.credit_memo"/>
             <argument type="service" id="Sylius\RefundPlugin\Sender\CreditMemoEmailSender"/>
-            <tag name="messenger.message_handler" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/event_bus.xml b/src/Resources/config/services/event_bus.xml
index c86065f48..dce556d3b 100644
--- a/src/Resources/config/services/event_bus.xml
+++ b/src/Resources/config/services/event_bus.xml
@@ -5,23 +5,23 @@
         <defaults autowire="false" autoconfigure="false" public="true" />
 
         <service id="Sylius\RefundPlugin\Listener\CreditMemoGeneratedEventListener">
-            <argument type="service" id="sylius_refund_plugin.event_bus" />
-            <tag name="messenger.message_handler" />
+            <argument type="service" id="sylius_default.bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\Listener\UnitRefundedEventListener">
             <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver" />
-            <tag name="messenger.message_handler" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\Listener\ShipmentRefundedEventListener">
             <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver" />
-            <tag name="messenger.message_handler" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\ProcessManager\CreditMemoProcessManager">
-            <argument type="service" id="sylius_refund_plugin.command_bus" />
-            <tag name="messenger.message_handler" />
+            <argument type="service" id="sylius_default.bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\ProcessManager\RefundPaymentProcessManager">
@@ -29,8 +29,8 @@
             <argument type="service" id="Sylius\RefundPlugin\Provider\RelatedPaymentIdProviderInterface" />
             <argument type="service" id="Sylius\RefundPlugin\Factory\RefundPaymentFactory" />
             <argument type="service" id="doctrine.orm.default_entity_manager" />
-            <argument type="service" id="sylius_refund_plugin.event_bus" />
-            <tag name="messenger.message_handler" />
+            <argument type="service" id="sylius_event.bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
     </services>
 </container>
diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
index eb5b6a771..827e53b39 100644
--- a/tests/Behat/Resources/services.xml
+++ b/tests/Behat/Resources/services.xml
@@ -31,7 +31,7 @@
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius_refund.repository.refund" />
             <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" />
-            <argument type="service" id="sylius_refund_plugin.command_bus" />
+            <argument type="service" id="sylius_default.bus" />
             <argument type="service" id="sylius.behat.email_checker" />
         </service>
 
@@ -63,7 +63,7 @@
 
         <service id="Tests\Sylius\RefundPlugin\Behat\Context\Setup\RefundingContext">
             <argument type="service" id="sylius.repository.order" />
-            <argument type="service" id="sylius_refund_plugin.command_bus" />
+            <argument type="service" id="sylius_default.bus" />
         </service>
 
         <service id="Tests\Sylius\RefundPlugin\Behat\Context\Setup\OrderContext">