diff --git a/CHANGES.md b/CHANGES.md
index 1918c173..e87d2467 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,9 @@ Notable changes between versions.
 
 * Add `node_labels` variable to internal `workers` module ([#550](https://github.com/poseidon/typhoon/pull/550))
 
+#### Addons
+
+* Update Grafana from v6.3.5 to [v6.3.6](https://github.com/grafana/grafana/releases/tag/v6.3.6)
 
 ## v1.16.0
 
diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml
index 5c2671b6..6bef7bdb 100644
--- a/addons/grafana/deployment.yaml
+++ b/addons/grafana/deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: grafana
-          image: docker.io/grafana/grafana:6.3.5
+          image: docker.io/grafana/grafana:6.3.6
           env:
             - name: GF_PATHS_CONFIG
               value: "/etc/grafana/custom.ini"