diff --git a/.github/mergeable.yml b/.github/mergeable.yml
index 12d4b2b1..75dbd00d 100644
--- a/.github/mergeable.yml
+++ b/.github/mergeable.yml
@@ -22,3 +22,20 @@ mergeable:
         no_empty:
           enabled: true  # Cannot be empty when true.
           message: 'Milestone must be assigned before merging. Typically this is "release/next".'
+      - do: description
+        no_empty:
+          enabled: true
+        must_exclude:
+          regex: '```release-note\s*```'
+          regex_flag: m
+          message: 'release-note block cannot be empty.'
+        must_include:
+          regex: '```release-note$(.|\r\n)+^```'
+          regex_flag: mi
+          message: |
+            Must include release-note block:
+              <code style="white-space: pre;">
+              ```release-note
+              note (or "none")
+              ```
+              </code>
diff --git a/addons/elasticsearchexporter/elasticsearchexporter.yaml b/addons/elasticsearchexporter/elasticsearchexporter.yaml
index 0122aee7..3117eeee 100644
--- a/addons/elasticsearchexporter/elasticsearchexporter.yaml
+++ b/addons/elasticsearchexporter/elasticsearchexporter.yaml
@@ -6,9 +6,9 @@ metadata:
   labels:
     kubeaddons.mesosphere.io/name: elasticsearchexporter
   annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-4"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-5"
     appversion.kubeaddons.mesosphere.io/elasticsearchexporter: "1.1.0"
-    values.chart.helm.kubeaddons.mesosphere.io/elasticsearchexporter: "https://raw.githubusercontent.com/mesosphere/charts/73fba37/stable/elasticsearch-exporter/values.yaml"
+    values.chart.helm.kubeaddons.mesosphere.io/elasticsearchexporter: "https://raw.githubusercontent.com/mesosphere/charts/f39e235/stable/elasticsearch-exporter/values.yaml"
 spec:
   kubernetes:
     minSupportedVersion: v1.15.6
@@ -31,7 +31,7 @@ spec:
   chartReference:
     chart: prometheus-elasticsearch-exporter
     repo: https://prometheus-community.github.io/helm-charts
-    version: 4.0.0
+    version: 4.0.1
     values: |
       ---
       # As defined in the readme file when migrating from old chart to new chart
diff --git a/mergebot-config.json b/mergebot-config.json
index 466ddced..4e943dc5 100644
--- a/mergebot-config.json
+++ b/mergebot-config.json
@@ -3,8 +3,9 @@
      "enabled": true,
      "interactive": false,
      "fix_version_map": {
-       "master": "K8s Base Addons 2.1.0",
-       "testing": "K8s Base Addons 2.0.0",
+       "master": "K8s Base Addons 3.0.0",
+       "release/3": "K8s Base Addons 3.0.0",
+       "release/2": "K8s Base Addons 2.6.0",
      }
    }
 }