diff --git a/docker/heat-api/Dockerfile.j2 b/docker/heat-api/Dockerfile.j2
index 3f5b894..7dff32d 100644
--- a/docker/heat-api/Dockerfile.j2
+++ b/docker/heat-api/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/heat-base:{{ tag }}
+FROM {{ image_spec("heat-base") }}
 MAINTAINER {{ maintainer }}
 
 #mysql-client only for provisioning need to be removed later
diff --git a/docker/heat-base/Dockerfile.j2 b/docker/heat-base/Dockerfile.j2
index d15f5f8..c3c0a16 100644
--- a/docker/heat-base/Dockerfile.j2
+++ b/docker/heat-base/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/openstack-base:{{ tag }}
+FROM {{ image_spec("openstack-base") }}
 MAINTAINER {{ maintainer }}
 
 {{ copy_sources("openstack/heat", "/heat") }}
diff --git a/docker/heat-engine/Dockerfile.j2 b/docker/heat-engine/Dockerfile.j2
index edcc923..172a070 100644
--- a/docker/heat-engine/Dockerfile.j2
+++ b/docker/heat-engine/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/heat-base:{{ tag }}
+FROM {{ image_spec("heat-base") }}
 MAINTAINER {{ maintainer }}
 
 USER heat