diff --git a/Dockerfile b/Dockerfile
index 349af495..1249bc36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM rpi-buildstep-armv6hf:latest
+FROM resin/rpi-buildstep-armv6hf:latest
 ADD . /app
 RUN /build/builder
diff --git a/Makefile b/Makefile
index 26949214..f394ac29 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,13 @@ BUILDSTEP_REGISTRY = registry.staging.resin.io
 
 BUILDSTEP_VERSION = latest
 
+BUILDSTEP_REPO = resin/rpi-buildstep-armv6hf
+
 all: supervisor 
 
 supervisor:
-	docker pull $(BUILDSTEP_REGISTRY)/resin/rpi-buildstep-armv6hf:$(BUILDSTEP_VERSION)
-	docker tag $(BUILDSTEP_REGISTRY)/resin/rpi-buildstep-armv6hf:$(BUILDSTEP_VERSION) rpi-buildstep-armv6hf:latest
+	docker pull $(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO):$(BUILDSTEP_VERSION)
+	docker tag $(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO):$(BUILDSTEP_VERSION) resin/rpi-buildstep-armv6hf:latest
 	docker build --no-cache=$(DISABLE_CACHE) -t $(IMAGE):$(SUPERVISOR_VERSION) .
 	docker tag $(IMAGE):$(SUPERVISOR_VERSION) $(SUPERVISOR_REGISTRY)/$(IMAGE):$(SUPERVISOR_VERSION)