diff --git a/charts/cilium-mixin/Chart.yaml b/charts/cilium-mixin/Chart.yaml
index b77d5d09..8bd0c2a6 100644
--- a/charts/cilium-mixin/Chart.yaml
+++ b/charts/cilium-mixin/Chart.yaml
@@ -27,7 +27,7 @@ keywords:
   - cilium
   - monitoring-mixin
   - portefaix
-version: 0.3.2
+version: 0.4.0
 appVersion: master
 
 maintainers:
@@ -52,5 +52,5 @@ annotations:
     fingerprint: C39918B3EBDE35C23B8D0B8E5F99269A6FCA437C
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: fixed
-      description: key for dashboard json file in lowercase
\ No newline at end of file
+    - kind: changed
+      description: cilium-mixin vmaster
diff --git a/charts/cilium-mixin/templates/alerts.yaml b/charts/cilium-mixin/templates/alerts.yaml
index 46046cb8..3e1a2227 100644
--- a/charts/cilium-mixin/templates/alerts.yaml
+++ b/charts/cilium-mixin/templates/alerts.yaml
@@ -208,4 +208,48 @@ spec:
             for: 15m
             labels:
               severity: info
+      - name: Cilium Clustermesh
+        rules:
+          - alert: CiliumAgentRemoteClusterNotReady
+            annotations:
+              description: Agent can't mesh with {{`{{`}}$labels.target_cluster{{`}}`}}
+              summary: Agent can't mesh with remote cluster.
+            expr: count(cilium_clustermesh_remote_cluster_readiness_status < 1) by (source_cluster, target_cluster) > 0
+            for: 5m
+            labels:
+              severity: critical
+          - alert: CiliumAgentRemoteClusterFailing
+            annotations:
+              description: Agent fails to mesh with {{`{{`}}$labels.target_cluster{{`}}`}}
+              summary: Agent fails to mesh with remote cluster.
+            expr: sum(rate(cilium_clustermesh_remote_cluster_failures[5m])) by (source_cluster, target_cluster) > 0
+            for: 5m
+            labels:
+              severity: critical
+      - name: Cilium Kvstoremesh
+        rules:
+          - alert: CiliumKvstoremeshRemoteClusterNotReady
+            annotations:
+              description: Kvstoremesh can't mesh with {{`{{`}}$labels.target_cluster{{`}}`}}
+              summary: Kvstoremesh can't mesh with remote cluster.
+            expr: count(cilium_kvstoremesh_remote_cluster_readiness_status < 1) by (source_cluster, target_cluster) > 0
+            for: 5m
+            labels:
+              severity: critical
+          - alert: CiliumKvstoremeshRemoteClusterFailing
+            annotations:
+              description: Kvstoremesh fails to mesh with {{`{{`}}$labels.target_cluster{{`}}`}}
+              summary: Kvstoremesh fails to mesh with remote cluster.
+            expr: sum(rate(cilium_kvstoremesh_remote_cluster_failures[5m])) by (source_cluster, target_cluster) > 0
+            for: 5m
+            labels:
+              severity: critical
+          - alert: CiliumKvstoremeshErrors
+            annotations:
+              description: Kvstoremesh fails to mesh with {{`{{`}}$labels.target_cluster{{`}}`}}
+              summary: Kvstoremesh fails to mesh with remote cluster.
+            expr: sum(rate(cilium_kvstoremesh_kvstore_sync_errors_total[5m])) by (source_cluster) > 0
+            for: 5m
+            labels:
+              severity: critical
 {{- end }}
diff --git a/charts/cilium-mixin/templates/configmap-dashboards.yaml b/charts/cilium-mixin/templates/configmap-dashboards.yaml
index 1bd782a8..3b3017f3 100644
--- a/charts/cilium-mixin/templates/configmap-dashboards.yaml
+++ b/charts/cilium-mixin/templates/configmap-dashboards.yaml
@@ -17,7 +17,7 @@ items:
       grafana-dashboard: {{ $dashboardName }}
       {{- include "cilium-mixin.labels" $ | indent 6 }}
       app.kubernetes.io/component: dashboard
-    name: {{ printf "dashboard-%s" $dashboardName | trunc 63 | trimSuffix "-"  }}
+    name: {{ printf "dashboard-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
     namespace: {{ include "cilium-mixin.namespace" $ }}
   data:
     {{ $dashboardName }}.json: |-
@@ -25,7 +25,7 @@ items:
 {{- end }}
 {{ if $.Values.grafanaDashboard.grafanaOperator.enabled -}}
 {{- range $path, $fileContents := $files }}
-{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" | lower }}
+{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
 ---
 apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
@@ -33,7 +33,7 @@ metadata:
   labels:
     {{- include "cilium-mixin.labels" $ | indent 4 }}
     app.kubernetes.io/component: dashboard
-  name: {{ printf "%s" $dashboardName | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s" $dashboardName | trunc 63 | trimSuffix "-" | lower }}
   namespace: {{ $.Release.Namespace }}
 spec:
   allowCrossNamespaceImport: {{ $.Values.grafanaDashboard.grafanaOperator.allowCrossNamespaceImport }}