diff --git a/Dockerfile b/Dockerfile
index 1543ade9a3e3d3bb7f284d552b6803d15ba036d6..fe90632e1b0f18a210b9553288f44352b15a7a78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8
 
-RUN set -ex && apt-get update && apt-get upgrade -y && apt-get install -y build-essential ocl-icd-opencl-dev libtool autoconf autotools-dev automake maven --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN set -ex && apt-get update && apt-get upgrade -y && apt-get install -y build-essential ocl-icd-opencl-dev libtool autoconf autotools-dev automake maven gcc-multilib g++-multilib --no-install-recommends && dpkg --add-architecture i386 && apt-get update && apt-get install -y ocl-icd-opencl-dev:i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
 COPY . /usr/src/app
 WORKDIR /usr/src/app
diff --git a/build.sh b/build.sh
index 64b52436eb431b76ee1a03114c48cb247cc5f208..11c26f96ff33cbf40584e9d01a596124d2ac3e48 100755
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,7 @@ automake --add-missing
 ./configure
 make
 mv .libs .libs64
+make clean
 ./configure --build=i686-pc-linux-gnu "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"
 make
 mv .libs .libs32
diff --git a/docker-compose.yml b/docker-compose.yml
index bd4226f28dd33786032b03b09619f4f738eea94b..764fe9cb4b8bea60a31f24ea0c43fa122a8c53c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   aparapi_native_builder:
     container_name: aparapi_native_builder
-    image: 'aparapi/aparapi-native-builder'
+    image: 'aparapi/aparapi-native-builder:latest'
     build:
       context: .
     user: "$UID:$GID"