diff --git a/contrib/telegraf.conf b/contrib/telegraf.conf
index 909e6711eca..965bc44a3de 100644
--- a/contrib/telegraf.conf
+++ b/contrib/telegraf.conf
@@ -106,7 +106,7 @@
   ## AMQP queue name
   queue = ""
   ## Binding Key
-  binding_key = "#"
+  binding_key = "opensuse.obs.metrics"
 
   ## Maximum number of messages server should give to the worker.
   prefetch_count = 50
diff --git a/src/api/app/models/event/base.rb b/src/api/app/models/event/base.rb
index 471e0f3e037..8cebedf5d19 100644
--- a/src/api/app/models/event/base.rb
+++ b/src/api/app/models/event/base.rb
@@ -272,7 +272,7 @@ def _roles(role, project, package = nil)
 
     def send_to_bus
       RabbitmqBus.send_to_bus(self.class.message_bus_routing_key, self[:payload])
-      RabbitmqBus.send_to_bus("metrics.#{self.class.message_bus_routing_key}", to_metric) if metric_fields.present?
+      RabbitmqBus.send_to_bus('metrics', to_metric) if metric_fields.present?
     end
 
     private