diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4b0a8f260d50796aa2753ffbbb1228a3dcc1e12e..88804abf160d1e5e3edea877ae4ca0959b7adf37 120000
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1 +1 @@
-Dockerfile_ubuntu_20.10
\ No newline at end of file
+Dockerfile_ubuntu_20.04
\ No newline at end of file
diff --git a/docker/Dockerfile_debian_11 b/docker/Dockerfile_debian_11
deleted file mode 100644
index 514676f39b942665111041431185e1c32ecbb049..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_debian_11
+++ /dev/null
@@ -1,84 +0,0 @@
-FROM debian:bullseye
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV QT_QUICK_BACKEND software
-ENV QT_QPA_PLATFORM offscreen
-
-RUN apt-get clean
-RUN apt-get update
-RUN apt-get install -y -o Acquire::Retries=10 \
-        python3 \
-        git \
-        autoconf \
-        automake \
-        autopoint \
-        cmake \
-        libtool \
-        libdbus-1-dev \
-        libdbus-c++-dev \
-        libargon2-0-dev \
-        libcanberra-gtk3-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 \
-        nasm \
-        autotools-dev \
-        gettext \
-        libpulse-dev \
-        libasound2-dev \
-        libexpat1-dev \
-        libpcre3-dev \
-        libyaml-cpp-dev \
-        libboost-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-dev \
-        libwebkit2gtk-4.0-dev \
-        libcrypto++-dev \
-        libva-dev \
-        libvdpau-dev \
-        libssl-dev
-RUN apt-get install -y qtmultimedia5-dev \
-        libqt5svg5-dev \
-        qtwebengine5-dev \
-        qtdeclarative5-dev \
-        qtquickcontrols2-5-dev \
-        libqt5svg5-dev \
-        qml-module-qtquick2 \
-        qml-module-qtquick-controls \
-        qml-module-qtquick-controls2 \
-        qml-module-qtquick-dialogs \
-        qml-module-qtquick-layouts \
-        qml-module-qtquick-privatewidgets \
-        qml-module-qtquick-shapes \
-        qml-module-qtquick-window2 \
-        qml-module-qtquick-templates2 \
-        qml-module-qt-labs-platform \
-        qml-module-qtwebengine \
-        qml-module-qtwebchannel \
-        qml-module-qttest \
-        pandoc \
-        googletest \
-        libgtest-dev
\ No newline at end of file
diff --git a/docker/Dockerfile_ubuntu_20.10 b/docker/Dockerfile_ubuntu_20.04
similarity index 65%
rename from docker/Dockerfile_ubuntu_20.10
rename to docker/Dockerfile_ubuntu_20.04
index 5de5df7841d690a93b3b51f9a14f3940fa3fa108..1562bbdb01276813d86eedcdd3580bcc1e8d3651 100644
--- a/docker/Dockerfile_ubuntu_20.10
+++ b/docker/Dockerfile_ubuntu_20.04
@@ -1,4 +1,4 @@
-FROM ubuntu:20.10
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV QT_QUICK_BACKEND software
@@ -8,6 +8,14 @@ RUN apt-get clean
 RUN apt-get update && \
     apt-get install -y devscripts equivs
 
+RUN apt install gnupg dirmngr ca-certificates curl --no-install-recommends
+RUN curl -s https://dl.jami.net/public-key.gpg | tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
+RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_20.04/ jami main' > /etc/apt/sources.list.d/jami.list"
+RUN apt-get update && apt-get install libqt-jami -y
+
+ENV QT5_PATH=/usr/lib/libqt-jami/
+ENV QT5_VER=5.15.2
+
 RUN apt-get install -y -o Acquire::Retries=10 \
         python3 \
         git \
@@ -25,9 +33,6 @@ RUN apt-get install -y -o Acquire::Retries=10 \
         libglib2.0-dev \
         libgtk-3-dev \
         libnotify-dev \
-        qtbase5-dev \
-        qttools5-dev \
-        qttools5-dev-tools \
         yasm \
         nasm \
         autotools-dev \
@@ -62,25 +67,6 @@ RUN apt-get install -y -o Acquire::Retries=10 \
         libva-dev \
         libvdpau-dev \
         libssl-dev
-RUN apt-get install -y qtmultimedia5-dev \
-        libqt5svg5-dev \
-        qtwebengine5-dev \
-        qtdeclarative5-dev \
-        qtquickcontrols2-5-dev \
-        libqt5svg5-dev \
-        qml-module-qtquick2 \
-        qml-module-qtquick-controls \
-        qml-module-qtquick-controls2 \
-        qml-module-qtquick-dialogs \
-        qml-module-qtquick-layouts \
-        qml-module-qtquick-privatewidgets \
-        qml-module-qtquick-shapes \
-        qml-module-qtquick-window2 \
-        qml-module-qtquick-templates2 \
-        qml-module-qt-labs-platform \
-        qml-module-qtwebengine \
-        qml-module-qtwebchannel \
-        qml-module-qttest \
-        pandoc \
+RUN apt-get install -y pandoc \
         googletest \
         libgtest-dev
\ No newline at end of file