diff --git a/rabbitmq/files/telegraf.conf b/rabbitmq/files/telegraf.conf
index 79bf250..376560f 100644
--- a/rabbitmq/files/telegraf.conf
+++ b/rabbitmq/files/telegraf.conf
@@ -1,4 +1,5 @@
 [[inputs.rabbitmq]]
+{%- include 'telegraf/files/input/_common.conf' %}
   url = "{{ values.url }}"
   username = "{{ values.username }}"
   password = "{{ values.password }}"
@@ -14,4 +15,4 @@
 {%- if values.queue_name_exclude is defined %}
   queue_name_exclude = {{ values.queue_name_exclude|json }}
 {%- endif %}
-{%- include 'telegraf/files/input/_tags.conf' %}
+{%- include 'telegraf/files/input/_filters.conf' %}
diff --git a/rabbitmq/meta/telegraf.yml b/rabbitmq/meta/telegraf.yml
index 66ea8f3..ace1586 100644
--- a/rabbitmq/meta/telegraf.yml
+++ b/rabbitmq/meta/telegraf.yml
@@ -4,15 +4,16 @@
   input:
     rabbitmq:
       template: rabbitmq/files/telegraf.conf
+      # Input plugin configuration
       url: "http://{{ server.management.bind.address }}:{{ server.management.bind.port }}"
       username: {{ server.admin.name }}
       password: >-
         {{ server.admin.password }}
       nodes: [ "rabbit@{{ grains.host }}" ]
       queue_name_exclude: [ "*" ]
+      # Measurement filtering
+      namepass: [ "rabbitmq", "rabbitmq_node", "rabbitmq_overview" ]
       tagexclude: [ "node", "url" ]
-      tagdrop:
-        queue: [ "*_fanout_*", "reply_*" ]
     procstat:
       process:
         rabbitmq: