diff --git a/docker/calico-dhcp-agent/Dockerfile.j2 b/docker/calico-dhcp-agent/Dockerfile.j2
index 0b46b9d..cf40e58 100644
--- a/docker/calico-dhcp-agent/Dockerfile.j2
+++ b/docker/calico-dhcp-agent/Dockerfile.j2
@@ -1,2 +1,2 @@
-FROM {{ namespace }}/neutron-base:{{ tag }}
+FROM {{ image_spec("neutron-base") }}
 MAINTAINER {{ maintainer }}
diff --git a/docker/calico-felix/Dockerfile.j2 b/docker/calico-felix/Dockerfile.j2
index 0b46b9d..cf40e58 100644
--- a/docker/calico-felix/Dockerfile.j2
+++ b/docker/calico-felix/Dockerfile.j2
@@ -1,2 +1,2 @@
-FROM {{ namespace }}/neutron-base:{{ tag }}
+FROM {{ image_spec("neutron-base") }}
 MAINTAINER {{ maintainer }}