diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index 9d997c019300685c0e7998ff4c9ec9d33bd5cc61..52f5d86076d0b42dcb979829136cf5c09d4706ab 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-debian32:8
+FROM i386/debian:8
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index 633c7f6c87b7aabe94027d2c8e03869f23a0869a..ec3b4f88732771e344ef51f399599118184e31b9 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-ubuntu32:14.04
+FROM i386/ubuntu:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386
index e43dd3ddb8a641afae887f021470ed9a029cca33..3052c671be0771b9e3f69a7be165aa564605d462 100644
--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-ubuntu32:15.10
+FROM i386/ubuntu:15.10
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index 2e49cc109bd94188f36c74628446caf94e6f0c6c..07fc3394e269cb1629618ea528ec7a137623bcd0 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-ubuntu32:16.04
+FROM i386/ubuntu:16.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
index 4ace40badda81c97e6feec48c8ff416f2da38f92..6f55736bfb98dc77e7c673f4d9ecaf8c6a034fbc 100644
--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-ubuntu32:16.10
+FROM i386/ubuntu:16.10
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index 4214187cce266a758dd4f50c85172f7c54f68aa0..93c4159418abaebb863419d4f35ebe33b42a169e 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -1,4 +1,4 @@
-FROM i386/ubuntu:17.10
+FROM i386/ubuntu:17.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386
new file mode 100644
index 0000000000000000000000000000000000000000..4214187cce266a758dd4f50c85172f7c54f68aa0
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -0,0 +1,80 @@
+FROM i386/ubuntu:17.10
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y vim \
+                       devscripts \
+                       software-properties-common
+
+# software-properties-common is needed for
+# add-apt-repository
+RUN add-apt-repository universe
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y equivs
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retires=10 \
+        git \
+        autoconf \
+        automake \
+        autopoint \
+        cmake \
+        libtool \
+        libdbus-1-dev \
+        libdbus-c++-dev \
+        libupnp-dev \
+        libgnutls28-dev \
+        libargon2-0-dev \
+        libebook1.2-dev \
+        libclutter-gtk-1.0-dev \
+        libclutter-1.0-dev \
+        libglib2.0-dev \
+        libgtk-3-dev \
+        libnotify-dev \
+        qtbase5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+        yasm \
+        autotools-dev \
+        gettext \
+        libpulse-dev \
+        libsamplerate0-dev \
+        libasound2-dev \
+        libexpat1-dev \
+        libpcre3-dev \
+        libyaml-cpp-dev \
+        libboost-dev \
+        libsndfile1-dev \
+        libxext-dev \
+        libxfixes-dev \
+        libspeex-dev \
+        libspeexdsp-dev \
+        uuid-dev \
+        libavcodec-dev \
+        libavutil-dev \
+        libavformat-dev \
+        libswscale-dev \
+        libavdevice-dev \
+        libopus-dev \
+        libudev-dev \
+        libgsm1-dev \
+        libjsoncpp-dev \
+        libmsgpack-dev \
+        libnatpmp-dev \
+        libappindicator3-dev \
+        libqrencode-dev \
+        libnm-glib-dev \
+        libwebkit2gtk-4.0-dev \
+        libcrypto++-dev \
+        libva-dev \
+        libvdpau-dev
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+CMD /opt/build-package-debian.sh