diff --git a/DependencyInjection/OldSoundRabbitMqExtension.php b/DependencyInjection/OldSoundRabbitMqExtension.php
index ddb98ec0..735a5480 100644
--- a/DependencyInjection/OldSoundRabbitMqExtension.php
+++ b/DependencyInjection/OldSoundRabbitMqExtension.php
@@ -11,7 +11,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -40,8 +40,11 @@ public function load(array $configs, ContainerBuilder $container): void
     {
         $this->container = $container;
 
-        $loader = new XmlFileLoader($this->container, new FileLocator([__DIR__ . '/../Resources/config']));
-        $loader->load('rabbitmq.xml');
+        $loader = new YamlFileLoader(
+            $container,
+            new FileLocator(__DIR__ . '/../Resources/config')
+        );
+        $loader->load('services.yaml');
 
         $configuration = $this->getConfiguration($configs, $container);
         $this->config = $this->processConfiguration($configuration, $configs);
diff --git a/Resources/config/rabbitmq.xml b/Resources/config/rabbitmq.xml
deleted file mode 100644
index f5d15794..00000000
--- a/Resources/config/rabbitmq.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" ?>
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <parameters>
-        <parameter key="old_sound_rabbit_mq.connection.class">PhpAmqpLib\Connection\AMQPStreamConnection</parameter>
-        <parameter key="old_sound_rabbit_mq.socket_connection.class">PhpAmqpLib\Connection\AMQPSocketConnection</parameter>
-        <parameter key="old_sound_rabbit_mq.lazy.connection.class">PhpAmqpLib\Connection\AMQPLazyConnection</parameter>
-        <parameter key="old_sound_rabbit_mq.lazy.socket_connection.class">PhpAmqpLib\Connection\AMQPLazySocketConnection</parameter>
-        <parameter key="old_sound_rabbit_mq.connection_factory.class">OldSound\RabbitMqBundle\RabbitMq\AMQPConnectionFactory</parameter>
-        <parameter key="old_sound_rabbit_mq.binding.class">OldSound\RabbitMqBundle\RabbitMq\Binding</parameter>
-        <parameter key="old_sound_rabbit_mq.producer.class">OldSound\RabbitMqBundle\RabbitMq\Producer</parameter>
-        <parameter key="old_sound_rabbit_mq.consumer.class">OldSound\RabbitMqBundle\RabbitMq\Consumer</parameter>
-        <parameter key="old_sound_rabbit_mq.multi_consumer.class">OldSound\RabbitMqBundle\RabbitMq\MultipleConsumer</parameter>
-        <parameter key="old_sound_rabbit_mq.dynamic_consumer.class">OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer</parameter>
-        <parameter key="old_sound_rabbit_mq.batch_consumer.class">OldSound\RabbitMqBundle\RabbitMq\BatchConsumer</parameter>
-        <parameter key="old_sound_rabbit_mq.anon_consumer.class">OldSound\RabbitMqBundle\RabbitMq\AnonConsumer</parameter>
-        <parameter key="old_sound_rabbit_mq.rpc_client.class">OldSound\RabbitMqBundle\RabbitMq\RpcClient</parameter>
-        <parameter key="old_sound_rabbit_mq.rpc_server.class">OldSound\RabbitMqBundle\RabbitMq\RpcServer</parameter>
-        <parameter key="old_sound_rabbit_mq.logged.channel.class">OldSound\RabbitMqBundle\RabbitMq\AMQPLoggedChannel</parameter>
-        <parameter key="old_sound_rabbit_mq.data_collector.class">OldSound\RabbitMqBundle\DataCollector\MessageDataCollector</parameter>
-        <parameter key="old_sound_rabbit_mq.parts_holder.class">OldSound\RabbitMqBundle\RabbitMq\AmqpPartsHolder</parameter>
-        <parameter key="old_sound_rabbit_mq.fallback.class">OldSound\RabbitMqBundle\RabbitMq\Fallback</parameter>
-    </parameters>
-
-    <services>
-        <service id="old_sound_rabbit_mq.data_collector" class="%old_sound_rabbit_mq.data_collector.class%">
-            <argument type="collection" />
-            <tag name="data_collector" template="@OldSoundRabbitMq/Collector/collector.html.twig" id="rabbit_mq" />
-        </service>
-        
-        <service id="old_sound_rabbit_mq.parts_holder" class="%old_sound_rabbit_mq.parts_holder.class%" public="true" />
-
-        <service id="old_sound_rabbit_mq.anon_consumer_command" class="OldSound\RabbitMqBundle\Command\AnonConsumerCommand">
-            <tag name="console.command" command="rabbitmq:anon-consumer" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.batch_consumer_command" class="OldSound\RabbitMqBundle\Command\BatchConsumerCommand">
-            <tag name="console.command" command="rabbitmq:batch:consumer" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.consumer_command" class="OldSound\RabbitMqBundle\Command\ConsumerCommand">
-            <tag name="console.command" command="rabbitmq:consumer" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.delete_command" class="OldSound\RabbitMqBundle\Command\DeleteCommand">
-            <tag name="console.command" command="rabbitmq:delete" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.dynamic_consumer_command" class="OldSound\RabbitMqBundle\Command\DynamicConsumerCommand">
-            <tag name="console.command" command="rabbitmq:dynamic-consumer" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.multiple_consumer_command" class="OldSound\RabbitMqBundle\Command\MultipleConsumerCommand">
-            <tag name="console.command" command="rabbitmq:multiple-consumer" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.purge_consumer_command" class="OldSound\RabbitMqBundle\Command\PurgeConsumerCommand">
-            <tag name="console.command" command="rabbitmq:purge" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.command.rpc_server_command" class="OldSound\RabbitMqBundle\Command\RpcServerCommand">
-            <tag name="console.command" command="rabbitmq:rpc-server" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.command.setup_fabric_command" class="OldSound\RabbitMqBundle\Command\SetupFabricCommand">
-            <tag name="console.command" command="rabbitmq:setup-fabric" />
-        </service>
-
-        <service id="old_sound_rabbit_mq.command.std_in_producer_command" class="OldSound\RabbitMqBundle\Command\StdInProducerCommand">
-            <tag name="console.command" command="rabbitmq:stdin-producer" />
-        </service>
-    </services>
-
-</container>
diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
new file mode 100644
index 00000000..d6af2c67
--- /dev/null
+++ b/Resources/config/services.yaml
@@ -0,0 +1,81 @@
+parameters:
+  old_sound_rabbit_mq.connection.class: PhpAmqpLib\Connection\AMQPStreamConnection
+  old_sound_rabbit_mq.socket_connection.class: PhpAmqpLib\Connection\AMQPSocketConnection
+  old_sound_rabbit_mq.lazy.connection.class: PhpAmqpLib\Connection\AMQPLazyConnection
+  old_sound_rabbit_mq.lazy.socket_connection.class: PhpAmqpLib\Connection\AMQPLazySocketConnection
+  old_sound_rabbit_mq.connection_factory.class: OldSound\RabbitMqBundle\RabbitMq\AMQPConnectionFactory
+  old_sound_rabbit_mq.binding.class: OldSound\RabbitMqBundle\RabbitMq\Binding
+  old_sound_rabbit_mq.producer.class: OldSound\RabbitMqBundle\RabbitMq\Producer
+  old_sound_rabbit_mq.consumer.class: OldSound\RabbitMqBundle\RabbitMq\Consumer
+  old_sound_rabbit_mq.multi_consumer.class: OldSound\RabbitMqBundle\RabbitMq\MultipleConsumer
+  old_sound_rabbit_mq.dynamic_consumer.class: OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer
+  old_sound_rabbit_mq.batch_consumer.class: OldSound\RabbitMqBundle\RabbitMq\BatchConsumer
+  old_sound_rabbit_mq.anon_consumer.class: OldSound\RabbitMqBundle\RabbitMq\AnonConsumer
+  old_sound_rabbit_mq.rpc_client.class: OldSound\RabbitMqBundle\RabbitMq\RpcClient
+  old_sound_rabbit_mq.rpc_server.class: OldSound\RabbitMqBundle\RabbitMq\RpcServer
+  old_sound_rabbit_mq.logged.channel.class: OldSound\RabbitMqBundle\RabbitMq\AMQPLoggedChannel
+  old_sound_rabbit_mq.data_collector.class: OldSound\RabbitMqBundle\DataCollector\MessageDataCollector
+  old_sound_rabbit_mq.parts_holder.class: OldSound\RabbitMqBundle\RabbitMq\AmqpPartsHolder
+  old_sound_rabbit_mq.fallback.class: OldSound\RabbitMqBundle\RabbitMq\Fallback
+
+services:
+  old_sound_rabbit_mq.data_collector:
+    class: '%old_sound_rabbit_mq.data_collector.class%'
+    arguments:
+      - []
+    tags:
+      - { name: 'data_collector', template: '@OldSoundRabbitMq/Collector/collector.html.twig', id: 'rabbit_mq' }
+
+  old_sound_rabbit_mq.parts_holder:
+    class: '%old_sound_rabbit_mq.parts_holder.class%'
+    public: true
+
+  old_sound_rabbit_mq.anon_consumer_command:
+    class: OldSound\RabbitMqBundle\Command\AnonConsumerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:anon-consumer' }
+
+  old_sound_rabbit_mq.batch_consumer_command:
+    class: OldSound\RabbitMqBundle\Command\BatchConsumerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:batch:consumer' }
+
+  old_sound_rabbit_mq.consumer_command:
+    class: OldSound\RabbitMqBundle\Command\ConsumerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:consumer' }
+
+  old_sound_rabbit_mq.delete_command:
+    class: OldSound\RabbitMqBundle\Command\DeleteCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:delete' }
+
+  old_sound_rabbit_mq.dynamic_consumer_command:
+    class: OldSound\RabbitMqBundle\Command\DynamicConsumerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:dynamic-consumer' }
+
+  old_sound_rabbit_mq.multiple_consumer_command:
+    class: OldSound\RabbitMqBundle\Command\MultipleConsumerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:multiple-consumer' }
+
+  old_sound_rabbit_mq.purge_consumer_command:
+    class: OldSound\RabbitMqBundle\Command\PurgeConsumerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:purge' }
+
+  old_sound_rabbit_mq.command.rpc_server_command:
+    class: OldSound\RabbitMqBundle\Command\RpcServerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:rpc-server' }
+
+  old_sound_rabbit_mq.command.setup_fabric_command:
+    class: OldSound\RabbitMqBundle\Command\SetupFabricCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:setup-fabric' }
+
+  old_sound_rabbit_mq.command.std_in_producer_command:
+    class: OldSound\RabbitMqBundle\Command\StdInProducerCommand
+    tags:
+      - { name: 'console.command', command: 'rabbitmq:stdin-producer' }