diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml
index c7b5eb0c..45defec7 100644
--- a/charts/kubezero-kiam/Chart.yaml
+++ b/charts/kubezero-kiam/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-kiam
 description: KubeZero Umbrella Chart for Kiam
 type: application
-version: 0.3.3
+version: 0.3.4
 appVersion: "4.0"
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
diff --git a/charts/kubezero-kiam/dashboards.yaml b/charts/kubezero-kiam/dashboards.yaml
new file mode 100644
index 00000000..e0f16225
--- /dev/null
+++ b/charts/kubezero-kiam/dashboards.yaml
@@ -0,0 +1,7 @@
+configmap: grafana-dashboards-kiam
+gzip: true
+folder: AWS
+dashboards:
+- name: kiam
+  url: https://raw.githubusercontent.com/uswitch/kiam/master/docs/dashboard-prom.json
+  tags: ['AWS']
diff --git a/charts/kubezero-kiam/templates/grafana-dashboards.yaml b/charts/kubezero-kiam/templates/grafana-dashboards.yaml
new file mode 100644
index 00000000..057b543b
--- /dev/null
+++ b/charts/kubezero-kiam/templates/grafana-dashboards.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards-kiam" | trunc 63 | trimSuffix "-" }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    grafana_dashboard: "1"
+{{ include "kubezero-lib.labels" . | indent 4 }}
+  annotations:
+    k8s-sidecar-target-directory: AWS
+binaryData:
+  kiam.json.gz:
+    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
diff --git a/charts/kubezero-kiam/update.sh b/charts/kubezero-kiam/update.sh
new file mode 100755
index 00000000..30d8c246
--- /dev/null
+++ b/charts/kubezero-kiam/update.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -ex
+
+# Fetch dashboards
+../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml