diff --git a/vitrage/datasources/__init__.py b/vitrage/datasources/__init__.py
index baedac720..4608d4698 100644
--- a/vitrage/datasources/__init__.py
+++ b/vitrage/datasources/__init__.py
@@ -49,7 +49,7 @@ OPTS = [
                default='vitrage_notifications',
                help='Vitrage configured notifications topic'),
     cfg.StrOpt('notification_topic_collector',
-               default='collector_event_notification',
+               default='vitrage_collector_notifications',
                help='The topic on which event will be sent from the '
                     'datasources to the graph processor')
 ]
diff --git a/vitrage/messaging.py b/vitrage/messaging.py
index 66685ecd8..c1f9c8489 100644
--- a/vitrage/messaging.py
+++ b/vitrage/messaging.py
@@ -52,7 +52,7 @@ def get_notification_listener(transport, targets, endpoints,
                               allow_requeue=False):
     """Return a configured oslo_messaging notification listener."""
     return oslo_messaging.get_notification_listener(
-        transport, targets, endpoints, executor='threading',
+        transport, targets, endpoints, executor='blocking',
         allow_requeue=allow_requeue)