diff --git a/scripts/build/docker/Dockerfile-i686 b/scripts/build/docker/Dockerfile-i686
index 27ecd9ac..bed66e01 100644
--- a/scripts/build/docker/Dockerfile-i686
+++ b/scripts/build/docker/Dockerfile-i686
@@ -1,4 +1,4 @@
-FROM toopher/ubuntu-i386:14.04
+FROM 32bit/debian:jessie
 
 # Install dependencies
 RUN apt-get update && apt-get install -y \
diff --git a/scripts/build/docker/Dockerfile-x86_64 b/scripts/build/docker/Dockerfile-x86_64
index 53ac8a85..1c61a165 100644
--- a/scripts/build/docker/Dockerfile-x86_64
+++ b/scripts/build/docker/Dockerfile-x86_64
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM debian:jessie
 
 # Install dependencies
 RUN apt-get update && apt-get install -y \
diff --git a/scripts/build/docker/compile-template.js b/scripts/build/docker/compile-template.js
index 1dbb4596..ec2dd83e 100644
--- a/scripts/build/docker/compile-template.js
+++ b/scripts/build/docker/compile-template.js
@@ -31,11 +31,11 @@ const template = fs.readFileSync(path.join(currentDirectory, 'Dockerfile.templat
 _.each([
   {
     architecture: 'i686',
-    image: 'toopher/ubuntu-i386:14.04'
+    image: '32bit/debian:jessie'
   },
   {
     architecture: 'x86_64',
-    image: 'ubuntu:14.04'
+    image: 'debian:jessie'
   }
 ], (options) => {
   const result = _.template(template)(options);
diff --git a/scripts/build/docker/run-command.sh b/scripts/build/docker/run-command.sh
index 93db599f..c527501b 100755
--- a/scripts/build/docker/run-command.sh
+++ b/scripts/build/docker/run-command.sh
@@ -89,6 +89,7 @@ done
 # The `-t` and TERM setup is needed to display coloured output.
 docker run -t \
   --env "TERM=xterm-256color" \
+  --env "TARGET_ARCH=$ARGV_ARCHITECTURE" \
   ${DOCKER_ENVVARS[@]+"${DOCKER_ENVVARS[@]}"} \
   --cap-add SYS_ADMIN \
   --device /dev/fuse:/dev/fuse:mrw \