diff --git a/automation/jenkins_build.sh b/automation/jenkins_build.sh
index 175a1fe..16cad32 100755
--- a/automation/jenkins_build.sh
+++ b/automation/jenkins_build.sh
@@ -10,7 +10,7 @@ docker build --no-cache=true -t node-$DISTRO-$ARCH-builder .
 
 for NODE_VERSION in $NODE_VERSIONS
 do
-	if [ $DISTRO == 'debian' ] && ([ $ARCH == 'armv7hf' ] || [ $ARCH == 'i386' ]); then
+	if [ $DISTRO == 'debian' ] && ([ $ARCH == 'armv7hf' ] || [ $ARCH == 'i386' ] || [ $ARCH == 'armel' ]); then
 		if version_le $NODE_VERSION 4; then
 			sed -e s~#{SUITE}~wheezy~g Dockerfile.tpl > Dockerfile
 		else
diff --git a/debian/armel/Dockerfile b/debian/armel/Dockerfile
deleted file mode 100644
index 185505c..0000000
--- a/debian/armel/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM ubuntu:14.04
-
-# Install deps
-RUN apt-get -q update \
-		&& apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi git lib32stdc++6 python python-pip build-essential lib32z1 wget ca-certificates gcc-multilib g++-multilib curl --no-install-recommends \
-		&& apt-get clean \
-		&& rm -rf /var/lib/apt/lists/*
-
-ENV AR arm-linux-gnueabi-ar
-ENV CC arm-linux-gnueabi-gcc
-ENV CXX arm-linux-gnueabi-g++
-ENV LINK arm-linux-gnueabi-g++
-
-# Install AWS CLI
-RUN pip install awscli
-
-RUN git clone https://github.com/nodejs/node.git
-
-COPY . /
diff --git a/debian/armel/Dockerfile.tpl b/debian/armel/Dockerfile.tpl
new file mode 100644
index 0000000..238d408
--- /dev/null
+++ b/debian/armel/Dockerfile.tpl
@@ -0,0 +1,13 @@
+FROM resin/armel-debian:#{SUITE}
+
+RUN apt-get -q update \
+		&& apt-get install -y git python python-dev python-pip build-essential wget ca-certificates libssl-dev curl --no-install-recommends \
+		&& apt-get clean \
+		&& rm -rf /var/lib/apt/lists/*
+
+# Install AWS CLI
+RUN pip install awscli
+
+RUN git clone https://github.com/nodejs/node.git
+
+COPY . /
diff --git a/debian/armel/build.sh b/debian/armel/build.sh
index a206c71..4f15aeb 100755
--- a/debian/armel/build.sh
+++ b/debian/armel/build.sh
@@ -13,19 +13,12 @@ DEST_DIR=node-v$NODE_VERSION-linux-$ARCH_VERSION
 TAR_FILE=node-v$NODE_VERSION-linux-$ARCH_VERSION.tar.gz
 BUCKET_NAME=$BUCKET_NAME
 
-BUILD_FLAGs="--without-snapshot --prefix / --with-arm-float-abi=softfp --dest-cpu=$ARCH"
+BUILD_FLAGs="--without-snapshot --prefix / "
 # --with-arm-fpu flag is not available for node versions 0.12.x and 0.10.x
 if version_ge "$NODE_VERSION" "4"; then
 	BUILD_FLAGs+=' --with-arm-fpu=vfp'
 fi
 
-if version_ge "$NODE_VERSION" "6"; then
-# ref https://github.com/nodejs/node/issues/7173
-	export CXX_host="g++ -m32"
-	export CC_host="gcc -m32" 
-	export LINK_host="g++ -m32"
-fi
-
 commit=($(echo "$(grep " v$NODE_VERSION" /commit-table)" | tr " " "\n"))
 if [ -z $commit ]; then
 	echo "commit for v$NODE_VERSION not found!"