diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 28b6eea04..6cca43ea0 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -19,7 +19,7 @@ images:
   tags:
     apache_proxy: docker.io/httpd:2.4
     memory_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    elasticsearch: docker.io/openstackhelm/elasticsearch-s3:7_1_0-20191119
+    elasticsearch: docker.io/openstackhelm/elasticsearch-s3:latest-7_1_0
     curator: docker.io/bobrik/curator:5.8.1
     ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
     s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216
diff --git a/fluentd/values.yaml b/fluentd/values.yaml
index 5eb3307e8..f671dd1ad 100644
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@@ -27,10 +27,9 @@ labels:
 
 images:
   tags:
-    fluentd: docker.io/openstackhelm/fluentd:debian-20200324
+    fluentd: docker.io/openstackhelm/fluentd:latest-debian
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    elasticsearch_template: docker.io/openstackhelm/heat:newton-ubuntu_xenial
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
   local_registry: