diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index a031091a37af765ef888e422bb283114d45b6aff..9da57967536f3df8fe4a5fef38c7605c996741d8 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
 LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
 
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
         build-essential pkg-config cmake git wget \
         libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools \
+        cython3 python3-dev python3-setuptools python3-build \
         libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
         libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
         libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
diff --git a/docker/DockerfileDepsFocal b/docker/DockerfileDepsFocal
new file mode 100644
index 0000000000000000000000000000000000000000..a031091a37af765ef888e422bb283114d45b6aff
--- /dev/null
+++ b/docker/DockerfileDepsFocal
@@ -0,0 +1,28 @@
+FROM ubuntu:20.04
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
+
+RUN apt-get update && apt-get install -y \
+        dialog apt-utils \
+    && apt-get clean \
+    && echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+RUN apt-get update && apt-get install -y \
+        build-essential pkg-config cmake git wget \
+        libtool autotools-dev autoconf \
+        cython3 python3-dev python3-setuptools \
+        libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
+        libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
+        libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+RUN echo "*** Downloading RESTinio ***" \
+    && mkdir restinio && cd restinio \
+    && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+    && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+    && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
+    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
+             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
+             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
+    && make -j8 && make install \
+    && cd ../../.. && rm -rf restinio
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index aaa02e5eaabb5da5f0628c3328efaa80ec3d111a..6869718196be81f8eabdd50ea175a3bed81b7bd3 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -11,7 +11,7 @@ RUN apt-get update \
     && apt-get install -y llvm llvm-dev lldb clang gdb make cmake pkg-config \
        libtool git wget libncurses5-dev libreadline-dev \
        nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev cython3 python3-dev \
-       python3-setuptools libcppunit-dev python3-pip \
+       python3-setuptools libcppunit-dev python3-pip python3-build \
        autotools-dev autoconf libssl-dev libargon2-dev \
        libfmt-dev libhttp-parser-dev libasio-dev \
     && apt-get remove -y gcc g++ && apt-get autoremove -y \
diff --git a/docker/DockerfileFocal b/docker/DockerfileFocal
new file mode 100644
index 0000000000000000000000000000000000000000..577291226ab6d062eac3ce902189376274630d5c
--- /dev/null
+++ b/docker/DockerfileFocal
@@ -0,0 +1,16 @@
+FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-bionic:latest
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
+
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
+	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
+				-DOPENDHT_C=On \
+				-DOPENDHT_PEER_DISCOVERY=On \
+				-DOPENDHT_PYTHON=On \
+				-DOPENDHT_TOOLS=On \
+				-DOPENDHT_PROXY_SERVER=On \
+				-DOPENDHT_PROXY_CLIENT=On \
+	&& make -j8 && make install \
+	&& cd ../.. && rm -rf opendht