diff --git a/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml
index 866b63b47e..e77e70f1dc 100644
--- a/roles/rabbitmq/tasks/main.yml
+++ b/roles/rabbitmq/tasks/main.yml
@@ -19,11 +19,3 @@
 - name: Start rabbitmq
   service: name=rabbitmq-server state=started enabled=yes
   tags: rabbitmq
-
-- name: Configure RabbitMQ monitoring in Zabbix
-  ansible.builtin.include_tasks: monitoring.yml
-  tags:
-    - rabbitmq
-    - selinux
-    - zabbix_agent
-    - zabbix_api
diff --git a/roles/rabbitmq/files/zabbix/selinux_rabbitmq.te b/roles/rabbitmq_cluster/files/zabbix/selinux_rabbitmq.te
similarity index 100%
rename from roles/rabbitmq/files/zabbix/selinux_rabbitmq.te
rename to roles/rabbitmq_cluster/files/zabbix/selinux_rabbitmq.te
diff --git a/roles/rabbitmq/files/zabbix/template-rabbitmq.yml b/roles/rabbitmq_cluster/files/zabbix/template-rabbitmq.yml
similarity index 100%
rename from roles/rabbitmq/files/zabbix/template-rabbitmq.yml
rename to roles/rabbitmq_cluster/files/zabbix/template-rabbitmq.yml
diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 187ced5b65..4af2c94ee3 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -449,6 +449,15 @@
   ansible.builtin.command: /etc/nagios/selinux-load.sh
   when: selinux_module is changed
 
+# RabbitMQ monitoring for Fedora Zabbix
+- name: Configure RabbitMQ monitoring in Zabbix
+  ansible.builtin.include_tasks: monitoring.yml
+  tags:
+    - rabbitmq_cluster
+    - selinux
+    - zabbix_agent
+    - zabbix_api
+
 # Queue monitoring for CentOS Zabbix
 - import_tasks: centos-monitoring.yml
   when: inventory_hostname.startswith('rabbitmq03') and env == 'production'
diff --git a/roles/rabbitmq/tasks/monitoring.yml b/roles/rabbitmq_cluster/tasks/monitoring.yml
similarity index 95%
rename from roles/rabbitmq/tasks/monitoring.yml
rename to roles/rabbitmq_cluster/tasks/monitoring.yml
index 7d1f179a0a..2c6d8f7de3 100644
--- a/roles/rabbitmq/tasks/monitoring.yml
+++ b/roles/rabbitmq_cluster/tasks/monitoring.yml
@@ -6,7 +6,7 @@
     state: directory
     mode: '0755'
   tags:
-  - rabbitmq
+  - rabbitmq_cluster
   - selinux
   - zabbix_agent
 
@@ -19,7 +19,7 @@
     mode: '0644'
   register: selinux_zabbix_file
   tags:
-  - rabbitmq
+  - rabbitmq_cluster
   - selinux
   - zabbix_agent
 
@@ -30,7 +30,7 @@
     selinux_module_name: zabbix_rabbitmq
   when: selinux_zabbix_file.changed
   tags:
-  - rabbitmq
+  - rabbitmq_cluster
   - selinux
   - zabbix_agent
 
@@ -41,7 +41,7 @@
     mode: '0600'
     owner: zabbix
   tags:
-    - rabbitmq
+    - rabbitmq_cluster
     - zabbix_agent
   notify:
     - Restart zabbix agent
@@ -57,8 +57,8 @@
     ansible_host: "{{ zabbix_server }}"
     ansible_zabbix_url_path: "{{ zabbix_url_path }}"
   tags:
+    - rabbitmq_cluster
     - zabbix_api
-    - rabbitmq
   block:
     - name: Import RabbitMQ template file
       community.zabbix.zabbix_template:
diff --git a/roles/rabbitmq/templates/zabbix/agent-rabbitmq.conf.j2 b/roles/rabbitmq_cluster/templates/zabbix/agent-rabbitmq.conf.j2
similarity index 100%
rename from roles/rabbitmq/templates/zabbix/agent-rabbitmq.conf.j2
rename to roles/rabbitmq_cluster/templates/zabbix/agent-rabbitmq.conf.j2