diff --git a/docker/glance-api/Dockerfile.j2 b/docker/glance-api/Dockerfile.j2
index 3c27b1a..6d96076 100644
--- a/docker/glance-api/Dockerfile.j2
+++ b/docker/glance-api/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/glance-base:{{ tag }}
+FROM {{ image_spec("glance-base") }}
 MAINTAINER {{ maintainer }}
 
 #mysql-client only for provisioning need to be removed later
diff --git a/docker/glance-base/Dockerfile.j2 b/docker/glance-base/Dockerfile.j2
index e113ae3..131260e 100644
--- a/docker/glance-base/Dockerfile.j2
+++ b/docker/glance-base/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/openstack-base:{{ tag }}
+FROM {{ image_spec("openstack-base") }}
 MAINTAINER {{ maintainer }}
 
 {{ copy_sources("openstack/glance", "/glance") }}
diff --git a/docker/glance-registry/Dockerfile.j2 b/docker/glance-registry/Dockerfile.j2
index 3cb1d29..18d1851 100644
--- a/docker/glance-registry/Dockerfile.j2
+++ b/docker/glance-registry/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/glance-base:{{ tag }}
+FROM {{ image_spec("glance-base") }}
 MAINTAINER {{ maintainer }}
 
 USER glance