diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index 922f520545954feaf7096d435442345d9d6065af..e1539d3b7b3c1c3b88b3d123df58f1b999ded91b 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -1,19 +1,10 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+{% import "macros.j2" as macros with context %}
 
-RUN yum -y install \
-        haproxy \
-    && yum clean all
-
-{% elif base_distro in ['debian', 'ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        haproxy \
-    && apt-get clean
-
-{% endif %}
+{% set haproxy_packages = ['haproxy'] %}
+RUN {{ macros.install_packages(haproxy_packages | customizable("packages")) }}
 
 RUN usermod -a -G kolla haproxy \
     && mkdir -p /var/lib/kolla/haproxy \
@@ -22,4 +13,6 @@ RUN usermod -a -G kolla haproxy \
 COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config
 RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config
 
+{% block haproxy_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}