diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2
new file mode 100644
index 0000000000..ea7f6d8d57
--- /dev/null
+++ b/docker/heat/heat-all/Dockerfile.j2
@@ -0,0 +1,24 @@
+FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block heat_all_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+       {% set heat_all_packages = [
+            'openstack-heat-api',
+            'openstack-heat-monolith',
+            'openstack-heat-engine'
+        ] %}
+    {% elif base_distro in ['ubuntu'] %}
+RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false
+    {% endif %}
+{{ macros.install_packages(heat_all_packages | customizable("packages")) }}
+
+{% endif %}
+{% block heat_all_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER heat
diff --git a/tests/test_build.py b/tests/test_build.py
index de2199b628..491637e5bc 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -108,6 +108,7 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
         "cloudkitty-base",
         "congress-base",
         "freezer-base",
+        "heat-all",
         "karbor-base",
         "kuryr-base",
         "monasca-base",