diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md
index 82df9d311..de0c85e05 100644
--- a/bitnami/zookeeper/README.md
+++ b/bitnami/zookeeper/README.md
@@ -115,6 +115,7 @@ The following tables lists the configurable parameters of the Zookeeper chart an
 | `metrics.podAnnotations`              | Additional annotations for Metrics exporter pod                     | `{prometheus.io/scrape: "true", prometheus.io/port: "9141"}` |
 | `metrics.resources`                   | Exporter resource requests/limit                                    | Memory: `256Mi`, CPU: `100m`                             |
 | `metrics.tolerations`                 | Exporter toleration labels for pod assignment                       | `[]`                                                     |
+| `metrics.timeoutSeconds`              | Timeout in seconds the exporter uses to scrape its targets          | 3                                                        |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
diff --git a/bitnami/zookeeper/templates/metrics-deployment.yaml b/bitnami/zookeeper/templates/metrics-deployment.yaml
index 3f34bfce3..7795fa046 100644
--- a/bitnami/zookeeper/templates/metrics-deployment.yaml
+++ b/bitnami/zookeeper/templates/metrics-deployment.yaml
@@ -39,6 +39,8 @@ spec:
         name: zookeeper-exporter
         command:
           - /usr/local/bin/zookeeper-exporter
+          - -timeout
+          - {{ .Values.metrics.timeoutSeconds | quote }}
           - -zk-list
           {{- $replicaCount := int .Values.replicaCount }}
           {{- $followerPort := int .Values.service.followerPort }}
diff --git a/bitnami/zookeeper/values-production.yaml b/bitnami/zookeeper/values-production.yaml
index ad7523ac8..afced95c9 100644
--- a/bitnami/zookeeper/values-production.yaml
+++ b/bitnami/zookeeper/values-production.yaml
@@ -195,8 +195,8 @@ metrics:
 
   image:
     registry: docker.io
-    repository: javsalgar/zookeeper-exporter
-    tag: latest
+    repository: dabealu/zookeeper-exporter
+    tag: v0.1.0
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
@@ -211,6 +211,8 @@ metrics:
     prometheus.io/port: "9141"
   podLabels: {}
 
+  timeoutSeconds: 3
+
   ## Metrics exporter resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml
index 368ad9cc1..edc99334f 100644
--- a/bitnami/zookeeper/values.yaml
+++ b/bitnami/zookeeper/values.yaml
@@ -195,8 +195,8 @@ metrics:
 
   image:
     registry: docker.io
-    repository: javsalgar/zookeeper-exporter
-    tag: latest
+    repository: dabealu/zookeeper-exporter
+    tag: v0.1.0
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
@@ -211,6 +211,8 @@ metrics:
     prometheus.io/port: "9141"
   podLabels: {}
 
+  timeoutSeconds: 3
+
   ## Metrics exporter resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##