diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index 9855b113b0..cb6a3d795a 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -72,6 +72,7 @@
     configure_priv: .*
     read_priv: .*
     write_priv: .*
+    tags: administrator
   tags:
   - rabbitmq_cluster
   - config
@@ -86,6 +87,7 @@
     configure_priv: "^$"
     read_priv: "^$"
     write_priv: "^$"
+    tags: monitoring
   tags:
   - rabbitmq_cluster
   - config
diff --git a/roles/odcs/backend/tasks/main.yml b/roles/odcs/backend/tasks/main.yml
index 60073dfbfd..a067a96c7e 100644
--- a/roles/odcs/backend/tasks/main.yml
+++ b/roles/odcs/backend/tasks/main.yml
@@ -148,6 +148,7 @@
     configure_priv: .*
     read_priv: .*
     write_priv: .*
+    tags: administrator
   tags:
   - rabbitmq_cluster
   - config
@@ -163,6 +164,7 @@
     configure_priv: "^$"
     read_priv: "^$"
     write_priv: "^$"
+    tags: monitoring
   tags:
   - rabbitmq_cluster
   - config