diff --git a/grafana/values.yaml b/grafana/values.yaml
index 3bfc73dce..d60afbc35 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -19,9 +19,9 @@ images:
   tags:
     grafana: docker.io/grafana/grafana:6.2.0
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    db_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    grafana_db_session_sync: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    selenium_tests: docker.io/openstackhelm/osh-selenium:ubuntu_bionic-20191017
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    grafana_db_session_sync: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic
     add_home_dashboard: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
diff --git a/nagios/values.yaml b/nagios/values.yaml
index eec055bea..c98955ec9 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -18,9 +18,9 @@
 images:
   tags:
     apache_proxy: docker.io/httpd:2.4
-    nagios: docker.io/openstackhelm/nagios:ubuntu_xenial-20191113
+    nagios: docker.io/openstackhelm/nagios:latest-ubuntu_xenial
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-    selenium_tests: docker.io/openstackhelm/osh-selenium:ubuntu_bionic-20191017
+    selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
   local_registry: