diff --git a/docker_templates/heat/heat-api-cfn/Dockerfile.j2 b/docker_templates/heat/heat-api-cfn/Dockerfile.j2
index 6bebe6227df40ffa8e8d1defdd4d2d6951009105..ecff87b009c4da9b29a53c2364eab5e570fe017f 100644
--- a/docker_templates/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker_templates/heat/heat-api-cfn/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
diff --git a/docker_templates/heat/heat-api/Dockerfile.j2 b/docker_templates/heat/heat-api/Dockerfile.j2
index 49552127ac163ed233cbc2aec56401a71c69ee78..2688a3270656a8f60e6e2c051e78a082bc89a561 100644
--- a/docker_templates/heat/heat-api/Dockerfile.j2
+++ b/docker_templates/heat/heat-api/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
diff --git a/docker_templates/heat/heat-engine/Dockerfile.j2 b/docker_templates/heat/heat-engine/Dockerfile.j2
index 60ee1b69649fed470e838e5da4514a050c0745ed..d080fec6a4d3215cb4683cdfb7aa3e1cc6afc996 100644
--- a/docker_templates/heat/heat-engine/Dockerfile.j2
+++ b/docker_templates/heat/heat-engine/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}