diff --git a/charts/yet-another-cloudwatch-exporter/Chart.yaml b/charts/yet-another-cloudwatch-exporter/Chart.yaml
index a1713e0..2c1b0d5 100644
--- a/charts/yet-another-cloudwatch-exporter/Chart.yaml
+++ b/charts/yet-another-cloudwatch-exporter/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: yet-another-cloudwatch-exporter
 description: Yace - Yet Another CloudWatch Exporter
 type: application
-version: 0.34.0
-appVersion: "v0.58.0"
+version: 0.35.0
+appVersion: "v0.59.0"
 home: https://github.com/nerdswords/helm-charts
 sources:
 - https://github.com/nerdswords/yet-another-cloudwatch-exporter
diff --git a/charts/yet-another-cloudwatch-exporter/README.md b/charts/yet-another-cloudwatch-exporter/README.md
index 99be785..8bc116a 100644
--- a/charts/yet-another-cloudwatch-exporter/README.md
+++ b/charts/yet-another-cloudwatch-exporter/README.md
@@ -1,6 +1,6 @@
 # yet-another-cloudwatch-exporter
 
-![Version: 0.34.0](https://img.shields.io/badge/Version-0.34.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.58.0](https://img.shields.io/badge/AppVersion-v0.58.0-informational?style=flat-square)
+![Version: 0.35.0](https://img.shields.io/badge/Version-0.35.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.59.0](https://img.shields.io/badge/AppVersion-v0.59.0-informational?style=flat-square)
 
 Yace - Yet Another CloudWatch Exporter
 
@@ -27,7 +27,7 @@ helm install nerdswords/yet-another-cloudwatch-exporter
 | aws.role | string | `nil` |  |
 | aws.secret.includesSessionToken | bool | `false` |  |
 | aws.secret.name | string | `nil` |  |
-| config | string | `"apiVersion: v1alpha1\nsts-region: eu-west-1\ndiscovery:\n  exportedTagsOnMetrics:\n    ec2:\n      - Name\n    ebs:\n      - VolumeId\n  jobs:\n  - type: es\n    regions:\n      - eu-west-1\n    searchTags:\n      - key: type\n        value: ^(easteregg|k8s)$\n    metrics:\n      - name: FreeStorageSpace\n        statistics:\n        - Sum\n        period: 60\n        length: 600\n      - name: ClusterStatus.green\n        statistics:\n        - Minimum\n        period: 60\n        length: 600\n      - name: ClusterStatus.yellow\n        statistics:\n        - Maximum\n        period: 60\n        length: 600\n      - name: ClusterStatus.red\n        statistics:\n        - Maximum\n        period: 60\n        length: 600"` |  |
+| config | string | `"apiVersion: v1alpha1\nsts-region: eu-west-1\ndiscovery:\n  exportedTagsOnMetrics:\n    AWS/ES:\n      - Name\n  jobs:\n  - type: AWS/ES\n    regions:\n      - eu-west-1\n    searchTags:\n      - key: type\n        value: ^(easteregg|k8s)$\n    metrics:\n      - name: FreeStorageSpace\n        statistics:\n        - Sum\n        period: 60\n        length: 600\n      - name: ClusterStatus.green\n        statistics:\n        - Minimum\n        period: 60\n        length: 600\n      - name: ClusterStatus.yellow\n        statistics:\n        - Maximum\n        period: 60\n        length: 600\n      - name: ClusterStatus.red\n        statistics:\n        - Maximum\n        period: 60\n        length: 600"` |  |
 | extraArgs | object | `{}` |  |
 | extraEnv | list | `[]` |  |
 | extraEnvFrom | list | `[]` |  |
diff --git a/charts/yet-another-cloudwatch-exporter/values.yaml b/charts/yet-another-cloudwatch-exporter/values.yaml
index edf9974..5c1ea1f 100644
--- a/charts/yet-another-cloudwatch-exporter/values.yaml
+++ b/charts/yet-another-cloudwatch-exporter/values.yaml
@@ -200,12 +200,10 @@ config: |-
   sts-region: eu-west-1
   discovery:
     exportedTagsOnMetrics:
-      ec2:
+      AWS/ES:
         - Name
-      ebs:
-        - VolumeId
     jobs:
-    - type: es
+    - type: AWS/ES
       regions:
         - eu-west-1
       searchTags: