diff --git a/Makefile b/Makefile
index d4d1613..c03a931 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,33 @@
-PLATFORMS = android-arm \
-			darwin-x64 \
-			linux-x86 \
-			linux-x64 \
-			linux-arm \
-			windows-x86 \
-			windows-x64
 DOCKER = docker
-IMAGE = steeve/cross-compiler
+IMAGE = rburns/cross-compiler
 
-all:
+android-arm:
+	$(DOCKER) build -t $(IMAGE):android-arm linux-arm
+
+darwin-x64:
+	$(DOCKER) build -t $(IMAGE):darwin-x64 darwin-x64
+
+linux-x86:
+	$(DOCKER) build -t $(IMAGE):darwin-x86 darwin-x86
+
+linux-x64:
+	$(DOCKER) build -t $(IMAGE):linux-x64 linux-x64
+
+linux-armv6:
+	$(DOCKER) build -t $(IMAGE):linux-arm linux-armv6
+
+linux-armv7:
+	$(DOCKER) build -t $(IMAGE):linux-armv7 linux-armv7
+
+windows-x86:
+	$(DOCKER) build -t $(IMAGE):windows-x86 windows-x86
+
+windows-x64:
+	$(DOCKER) build -t $(IMAGE):windows-x64 windows-x64
+
+base:
 	$(DOCKER) build -t $(IMAGE):base .
-	for i in $(PLATFORMS); do \
-		$(DOCKER) build -t $(IMAGE):$$i $$i ; \
-	done
+
+all: base android-arm darwin-x64 linux-x86 linux-x64 linux-arm linux-armv7 windows-x86 windows-x64
+
+.PHONY: all linux-armv6 linux-armv7
diff --git a/linux-arm/Dockerfile b/linux-armv6/Dockerfile
similarity index 97%
rename from linux-arm/Dockerfile
rename to linux-armv6/Dockerfile
index bb36c96..db3ddfa 100644
--- a/linux-arm/Dockerfile
+++ b/linux-armv6/Dockerfile
@@ -1,4 +1,4 @@
-FROM steeve/cross-compiler:base
+FROM rburns/cross-compiler:base
 MAINTAINER Steeve Morin "steeve.morin@gmail.com"
 
 ENV CROSS_TRIPLE arm-linux-gnueabihf
diff --git a/linux-arm/Dockerfile.armv7 b/linux-armv7/Dockerfile
similarity index 60%
rename from linux-arm/Dockerfile.armv7
rename to linux-armv7/Dockerfile
index ccb5bab..44a9cb3 100644
--- a/linux-arm/Dockerfile.armv7
+++ b/linux-armv7/Dockerfile
@@ -1,14 +1,12 @@
-FROM steeve/cross-compiler:base
+FROM rburns/cross-compiler:base
 MAINTAINER Steeve Morin "steeve.morin@gmail.com"
 
 # Add the cross compiler sources
-RUN echo "deb     http://toolchains.secretsauce.net unstable main" >> /etc/apt/sources.list && \
+RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list && \
     dpkg --add-architecture armhf && \
-    curl -L http://toolchains.secretsauce.net/key.gpg | apt-key add -
+    curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
 
-RUN apt-get update && apt-get -y install \
-                        gcc-4.9-arm-linux-gnueabihf \
-                        g++-4.9-arm-linux-gnueabihf
+RUN apt-get update && apt-get install -y crossbuild-essential-armhf
 
 ENV CROSS_TRIPLE arm-linux-gnueabihf
 ENV CROSS_ROOT /usr/${CROSS_TRIPLE}