diff --git a/roles/grafana/files/definitions/grafana_dashboard_definition_iap.json b/roles/grafana/files/definitions/default/grafana_dashboard_definition_iap.json
similarity index 100%
rename from roles/grafana/files/definitions/grafana_dashboard_definition_iap.json
rename to roles/grafana/files/definitions/default/grafana_dashboard_definition_iap.json
diff --git a/roles/grafana/files/definitions/grafana_dashboard_definition_iap2.json b/roles/grafana/files/definitions/default/grafana_dashboard_definition_iap2.json
similarity index 100%
rename from roles/grafana/files/definitions/grafana_dashboard_definition_iap2.json
rename to roles/grafana/files/definitions/default/grafana_dashboard_definition_iap2.json
diff --git a/roles/grafana/files/definitions/grafana_dashboard_definition_mongo.json b/roles/grafana/files/definitions/default/grafana_dashboard_definition_mongo.json
similarity index 100%
rename from roles/grafana/files/definitions/grafana_dashboard_definition_mongo.json
rename to roles/grafana/files/definitions/default/grafana_dashboard_definition_mongo.json
diff --git a/roles/grafana/files/definitions/grafana_dashboard_definition_node.json b/roles/grafana/files/definitions/default/grafana_dashboard_definition_node.json
similarity index 100%
rename from roles/grafana/files/definitions/grafana_dashboard_definition_node.json
rename to roles/grafana/files/definitions/default/grafana_dashboard_definition_node.json
diff --git a/roles/grafana/files/definitions/grafana_dashboard_definition_redis.json b/roles/grafana/files/definitions/default/grafana_dashboard_definition_redis.json
similarity index 100%
rename from roles/grafana/files/definitions/grafana_dashboard_definition_redis.json
rename to roles/grafana/files/definitions/default/grafana_dashboard_definition_redis.json
diff --git a/roles/grafana/files/definitions/grafana_dashboard_definition_rabbit.json b/roles/grafana/files/definitions/rabbitmq/grafana_dashboard_definition_rabbit.json
similarity index 100%
rename from roles/grafana/files/definitions/grafana_dashboard_definition_rabbit.json
rename to roles/grafana/files/definitions/rabbitmq/grafana_dashboard_definition_rabbit.json
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 0b8f8a5..a4e3968 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -49,15 +49,25 @@
     owner: "{{ grafana_user }}"
     mode: "0644"
 
-- name: Upload grafana dashboard definitions
+- name: Upload grafana dashboard default definitions
   ansible.builtin.copy:
-    src: definitions/
+    src: definitions/default/
     dest: "{{ grafana_install_dir }}/provisioning/dashboards/definitions/"
     directory_mode: "0755"
     group: "{{ grafana_group }}"
     owner: "{{ grafana_user }}"
     mode: "0644"
 
+- name: Upload grafana dashboard RabbitMQ definitions
+  ansible.builtin.copy:
+    src: definitions/rabbitmq/
+    dest: "{{ grafana_install_dir }}/provisioning/dashboards/definitions/"
+    directory_mode: "0755"
+    group: "{{ grafana_group }}"
+    owner: "{{ grafana_user }}"
+    mode: "0644"
+  when: "'rabbitmq' in groups"
+
 - name: Open Port on FirewallD Public Zone
   ansible.posix.firewalld:
     port: "{{ grafana_port }}/tcp"