diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index a84588e62..967672843 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -354,7 +354,11 @@ RUN mkdir -p /openstack && \
 
 {% block keystone_footer %}
 RUN mkdir -p /openstack && \
-    ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone /openstack/healthcheck && \
+    if [ -f /usr/share/openstack-tripleo-common/healtcheck/keystone ]; then \
+        ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone /openstack/healthcheck; \
+    else \
+        ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone-public /openstack/healthcheck; \
+    fi && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}