diff --git a/prooph/service-bus-symfony-bundle/0.6/config/packages/prooph_service_bus.yaml b/prooph/service-bus-symfony-bundle/0.6/config/packages/prooph_service_bus.yaml
index 35d75750..1f7158ae 100644
--- a/prooph/service-bus-symfony-bundle/0.6/config/packages/prooph_service_bus.yaml
+++ b/prooph/service-bus-symfony-bundle/0.6/config/packages/prooph_service_bus.yaml
@@ -1,6 +1,3 @@
-services:
-    Prooph\Bundle\ServiceBus\CommandBus: '@prooph_service_bus.default_command_bus'
-
 prooph_service_bus:
     command_buses:
         default_command_bus: ~
diff --git a/prooph/service-bus-symfony-bundle/0.6/config/services.yaml b/prooph/service-bus-symfony-bundle/0.6/config/services.yaml
new file mode 100644
index 00000000..df935807
--- /dev/null
+++ b/prooph/service-bus-symfony-bundle/0.6/config/services.yaml
@@ -0,0 +1,8 @@
+services:
+    Prooph\Bundle\ServiceBus\CommandBus: '@prooph_service_bus.default_command_bus'
+
+    command_handlers:
+        namespace: App\Messaging\Command\
+        public: true
+        resource: '../src/Messaging/Command/*Handler.php'
+        tags: [{ name: 'prooph_service_bus.default_command_bus.route_target', message_detection: true }]