diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2
index 10da65601d..0eddf0ae0c 100644
--- a/docker/kibana/Dockerfile.j2
+++ b/docker/kibana/Dockerfile.j2
@@ -1,23 +1,16 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 RUN useradd -r -m --user-group kibana \
     && usermod -a -G kolla kibana
 
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        kibana \
-    && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        kibana \
-    && apt-get clean
-
-{% endif %}
+{% set kibana_packages = ['kibana'] %}
+RUN {{ macros.install_packages(kibana_packages | customizable("packages"))  }}
 
+{% block kibana_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER kibana