diff --git a/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl b/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl
index cc1fdffc4..a9cd2a3c3 100644
--- a/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl
+++ b/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl
@@ -20,7 +20,7 @@ set -ex
 COMMAND="${@:-start}"
 
 function start () {
-  exec go-wrapper run -scrape_uri "$FLUENTD_METRICS_HOST"
+  exec fluentd_exporter --scrape_uri "$FLUENTD_METRICS_HOST"
 }
 
 function stop () {
diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml
index 7dc301b78..74b74d0a2 100644
--- a/fluent-logging/values.yaml
+++ b/fluent-logging/values.yaml
@@ -39,7 +39,7 @@ images:
   tags:
     fluentbit: docker.io/fluent/fluent-bit:0.14.2
     fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
-    prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
+    prometheus_fluentd_exporter: docker.io/bitnami/fluentd-exporter:0.2.0
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     helm_tests: docker.io/openstackhelm/heat:newton
     elasticsearch_template: docker.io/openstackhelm/heat:newton