diff --git a/charts/kubezero-mq/dashboards.yaml b/charts/kubezero-mq/dashboards-nats.yaml
similarity index 100%
rename from charts/kubezero-mq/dashboards.yaml
rename to charts/kubezero-mq/dashboards-nats.yaml
diff --git a/charts/kubezero-mq/dashboards-rabbitmq.yaml b/charts/kubezero-mq/dashboards-rabbitmq.yaml
new file mode 100644
index 00000000..25a039df
--- /dev/null
+++ b/charts/kubezero-mq/dashboards-rabbitmq.yaml
@@ -0,0 +1,8 @@
+configmap: grafana-dashboards-rabbitmq
+condition: '.Values.rabbitmq.metrics.enabled'
+gzip: true
+# folder: 
+dashboards:
+- name: rabbitmq
+  url: https://grafana.com/api/dashboards/10991/revisions/11/download
+  tags: ['RabbitMQ']
diff --git a/charts/kubezero-mq/example-nats-argocd.yaml b/charts/kubezero-mq/example-nats-argocd.yaml
new file mode 100644
index 00000000..3a24206e
--- /dev/null
+++ b/charts/kubezero-mq/example-nats-argocd.yaml
@@ -0,0 +1,35 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: nats
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/zero-down-time/kubezero'
+    path: charts/kubezero-mq
+    targetRevision: master
+    helm:
+      values: |
+        nats:
+          enabled: true
+          nats:
+            jetstream:
+              memStorage:
+                enabled: true
+                size: 128Mi
+              fileStorage:
+                enabled: true
+                storageClassName: ebs-sc-gp3-xfs
+          exporter:
+            serviceMonitor:
+              enabled: true
+
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: nats
+  syncPolicy:
+    automated:
+      prune: true
+    syncOptions:
+    - CreateNamespace=true
diff --git a/charts/kubezero-mq/example-rabbitmq-argocd.yaml b/charts/kubezero-mq/example-rabbitmq-argocd.yaml
new file mode 100644
index 00000000..7fc8d550
--- /dev/null
+++ b/charts/kubezero-mq/example-rabbitmq-argocd.yaml
@@ -0,0 +1,44 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: rabbitmq
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/zero-down-time/kubezero'
+    path: charts/kubezero-mq
+    targetRevision: master
+    helm:
+      values: |
+        rabbitmq:
+          enabled: true
+
+          replicaCount: 3
+
+          hosts:
+          - mq.example.com
+          auth:
+            password: blablabla
+            erlangCookie: changemeplease
+            tls:
+              enabled: true
+
+          # Some custom plugin to be installed at boot
+          communityPlugins: "https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/releases/download/3.8.9/rabbitmq_delayed_message_exchange-3.8.9-0199d11c.ez"
+          extraPlugins: "rabbitmq_delayed_message_exchange"
+
+          # Enabled metrics
+          metrics:
+            enabled: true
+            serviceMonitor:
+              enabled: true
+
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: rabbitmq
+  syncPolicy:
+    automated:
+      prune: true
+    syncOptions:
+    - CreateNamespace=true
diff --git a/charts/kubezero-mq/templates/rabbitmq/grafana-dashboards.yaml b/charts/kubezero-mq/templates/rabbitmq/grafana-dashboards.yaml
new file mode 100644
index 00000000..c66a513b
--- /dev/null
+++ b/charts/kubezero-mq/templates/rabbitmq/grafana-dashboards.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.rabbitmq.metrics.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards-rabbitmq" | trunc 63 | trimSuffix "-" }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    grafana_dashboard: "1"
+{{ include "kubezero-lib.labels" . | indent 4 }}
+binaryData:
+  rabbitmq.json.gz:
+    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
+{{- end }}
diff --git a/charts/kubezero-mq/update.sh b/charts/kubezero-mq/update.sh
index 121b6454..c875b714 100755
--- a/charts/kubezero-mq/update.sh
+++ b/charts/kubezero-mq/update.sh
@@ -11,4 +11,5 @@ cp -r k8s/helm/charts/nats/* charts/nats/
 rm -rf k8s
 
 # Fetch dashboards
-../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/nats/grafana-dashboards.yaml
+../kubezero-metrics/sync_grafana_dashboards.py dashboards-nats.yaml templates/nats/grafana-dashboards.yaml
+../kubezero-metrics/sync_grafana_dashboards.py dashboards-rabbitmq.yaml templates/rabbitmq/grafana-dashboards.yaml