diff --git a/src/midcom/bundle/config/services.yml b/src/midcom/bundle/config/services.yml
index cede7dd15..519a6f149 100644
--- a/src/midcom/bundle/config/services.yml
+++ b/src/midcom/bundle/config/services.yml
@@ -1,18 +1,17 @@
 services:
     subscriber:
         class: midcom\httpkernel\subscriber
+        tags:
+            - {name: 'kernel.event_subscriber'}
 
     watcher:
         class: midcom\events\watcher
         arguments: ['@componentloader']
+        tags:
+            - {name: 'kernel.event_subscriber'}
 
     event_dispatcher:
         class: Symfony\Component\EventDispatcher\EventDispatcher
-        calls:
-            - [addSubscriber, ['@subscriber']]
-            - [addSubscriber, ['@watcher']]
-            - [addSubscriber, ['@cache']]
-            - [addSubscriber, ['@head']]
 
     dispatcher:
         alias: event_dispatcher
@@ -69,6 +68,8 @@ services:
     cache:
         class: midcom_services_cache
         public: true
+        tags:
+            - {name: 'kernel.event_subscriber'}
 
     cache.module.content:
         class: midcom_services_cache_module_content
@@ -119,6 +120,8 @@ services:
     head:
         class: midcom_helper_head
         public: true
+        tags:
+            - {name: 'kernel.event_subscriber'}
 
     i18n:
         class: midcom_services_i18n
diff --git a/src/midcom/bundle/midcomBundle.php b/src/midcom/bundle/midcomBundle.php
index ff03b7dbd..15d4fbd84 100644
--- a/src/midcom/bundle/midcomBundle.php
+++ b/src/midcom/bundle/midcomBundle.php
@@ -17,6 +17,7 @@
 use midcom\bundle\dependencyInjection\cachePass;
 use midcom\bundle\dependencyInjection\indexerPass;
 use midcom\bundle\dependencyInjection\authPass;
+use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 
 class midcomBundle extends Bundle
 {
@@ -37,5 +38,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new FormPass);
         $container->addCompilerPass(new datamanagerPass);
         $container->addCompilerPass(new AddConsoleCommandPass);
+        $container->addCompilerPass(new RegisterListenersPass);
     }
 }