diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml
index a08b844bb..bfc999f17 100644
--- a/bitnami/elasticsearch/Chart.yaml
+++ b/bitnami/elasticsearch/Chart.yaml
@@ -1,5 +1,5 @@
 name: elasticsearch
-version: 0.1.5
+version: 0.1.6
 appVersion: 6.2.4
 description: A highly scalable open-source full-text search and analytics engine
 keywords:
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index 3c174b357..d9df7e1ad 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -138,9 +138,9 @@ The following table lists the configurable parameters of the Elasticsearch chart
 | `metrics.enabled`                                 | Enable prometheus exporter                                                                                                | `false`                                                             |
 | `metrics.name`                                    | Metrics pod name                                                                                                          | `metrics`                                                           |
 | `metrics.image.registry`                          | Metrics exporter image registry                                                                                           | `docker.io`                                                         |
-| `metrics.image.repository`                        | Metrics exporter image repository                                                                                         | `justwatch/elasticsearch_exporter`                                  |
-| `metrics.image.tag`                               | Metrics exporter image tag                                                                                                | `1.0.1`                                                             |
-| `metrics.image.pullPolicy`                        | Metrics exporter image pull policy                                                                                        | `IfNotPresent`                                                      |
+| `metrics.image.repository`                        | Metrics exporter image repository                                                                                         | `bitnami/elasticsearch-exporter`                                    |
+| `metrics.image.tag`                               | Metrics exporter image tag                                                                                                | `latest`                                                            |
+| `metrics.image.pullPolicy`                        | Metrics exporter image pull policy                                                                                        | `Always`                                                            |
 | `metrics.service.type`                            | Metrics exporter endpoint service type                                                                                    | `ClusterIP`                                                         |
 | `metrics.resources`                               | Metrics exporter resource requests/limit                                                                                  | `requests: { cpu: "25m" }`                                          |
 
diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml
index 11b30c649..007c92a3a 100644
--- a/bitnami/elasticsearch/values-production.yaml
+++ b/bitnami/elasticsearch/values-production.yaml
@@ -201,9 +201,9 @@ metrics:
   name: metrics
   image:
     registry: docker.io
-    repository: justwatch/elasticsearch_exporter
-    tag: 1.0.1
-    pullPolicy: IfNotPresent
+    repository: bitnami/elasticsearch-exporter
+    tag: latest
+    pullPolicy: Always
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9108"
diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml
index a10de5044..2a7d47c7b 100644
--- a/bitnami/elasticsearch/values.yaml
+++ b/bitnami/elasticsearch/values.yaml
@@ -201,9 +201,9 @@ metrics:
   name: metrics
   image:
     registry: docker.io
-    repository: justwatch/elasticsearch_exporter
-    tag: 1.0.1
-    pullPolicy: IfNotPresent
+    repository: bitnami/elasticsearch-exporter
+    tag: latest
+    pullPolicy: Always
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9108"