diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index a605a14ffb9c0e1760b94a6804bd25d235bf9250..c316443f9fbfa25cea7342d26fb9359e6347e2c5 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:9
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index b3873beb88fb328817d2f2486a427712baa8a7a8..9f8beed97cb5eb907f7cffddefa66d2f97fbbdbc 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-debian32:9
+FROM i386/debian:9
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
new file mode 100644
index 0000000000000000000000000000000000000000..fd32a41b75fca87884853074dde0f94836dc88e7
--- /dev/null
+++ b/docker/Dockerfile_fedora_26
@@ -0,0 +1,58 @@
+FROM fedora:26
+
+RUN dnf clean all
+RUN dnf install -y yum-utils rpmdevtools
+
+RUN dnf clean all
+RUN dnf upgrade -y && \
+    dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        cmake \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libsamplerate-devel \
+        libtool \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        boost-devel \
+        dbus-c++-devel \
+        dbus-devel \
+        libsndfile-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        uuid-c++-devel \
+        libupnp-devel \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel
+
+ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
+
+CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index 1e22614f5fefbc8ecd4a7213a67b62f9b379f5b7..4214187cce266a758dd4f50c85172f7c54f68aa0 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -1,4 +1,4 @@
-FROM savoirfairelinux/ring-ubuntu32:17.04
+FROM i386/ubuntu:17.10
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10
new file mode 100644
index 0000000000000000000000000000000000000000..34c6766d57e7d274f20d3617a2958aa0eebafcf5
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -0,0 +1,80 @@
+FROM ubuntu:artful
+
+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