diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04
index 3dd90032f..775709b6e 100644
--- a/docker/Dockerfile_ubuntu_20.04
+++ b/docker/Dockerfile_ubuntu_20.04
@@ -29,11 +29,7 @@ RUN add-apt-repository universe && \
         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 \
@@ -64,7 +60,6 @@ RUN add-apt-repository universe && \
         libayatana-appindicator3-dev \
         libqrencode-dev \
         libnm-dev \
-        libwebkit2gtk-4.0-dev \
         libcrypto++-dev \
         libva-dev \
         libvdpau-dev \
diff --git a/docker/Dockerfile_ubuntu_22.04 b/docker/Dockerfile_ubuntu_22.04
index 60d03e2c0..37459d2c6 100644
--- a/docker/Dockerfile_ubuntu_22.04
+++ b/docker/Dockerfile_ubuntu_22.04
@@ -25,11 +25,9 @@ RUN add-apt-repository universe && \
         libupnp-dev \
         libgnutls28-dev \
         libargon2-dev \
-        libcanberra-gtk3-dev \
         libclutter-gtk-1.0-dev \
         libclutter-1.0-dev \
         libglib2.0-dev \
-        libgtk-3-dev \
         libnotify-dev \
         yasm \
         nasm \
@@ -54,6 +52,7 @@ RUN add-apt-repository universe && \
         libswscale-dev \
         libavdevice-dev \
         libopus-dev \
+        libx264-dev \
         libpipewire-0.3-dev \
         libudev-dev \
         libjsoncpp-dev \
@@ -62,7 +61,6 @@ RUN add-apt-repository universe && \
         libayatana-appindicator3-dev \
         libqrencode-dev \
         libnm-dev \
-        libwebkit2gtk-4.0-dev \
         libcrypto++-dev \
         libva-dev \
         libvdpau-dev \
@@ -73,6 +71,9 @@ RUN add-apt-repository universe && \
         libexpat1 libexpat1-dev \
         lcov gcovr \
         libxcb-shape0-dev \
+        libwebrtc-audio-processing-dev \
+        libcppunit-dev \
+        libarchive-dev \
         ninja-build
 
 RUN apt-get install -y python3 python3-pip python3-setuptools \
diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_24.04
similarity index 76%
rename from docker/Dockerfile_ubuntu_18.04
rename to docker/Dockerfile_ubuntu_24.04
index aa960060e..0039b73dc 100644
--- a/docker/Dockerfile_ubuntu_18.04
+++ b/docker/Dockerfile_ubuntu_24.04
@@ -1,4 +1,6 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt install -y software-properties-common
@@ -6,34 +8,31 @@ RUN apt-get update && \
 RUN add-apt-repository universe && \
     apt-get update && \
     apt-get install -y -o Acquire::Retries=10 \
-        g++-8 \
-        gcc-8 \
-        cpp-8 \
+        g++ \
+        gcc \
+        cpp \
         file \
         make \
         libc6-dev \
-        libstdc++-8-dev \
+        libstdc++-10-dev \
         git \
         autoconf \
         automake \
         autopoint \
         cmake \
+        dpkg-dev \
         libdbus-1-dev \
         libupnp-dev \
         libgnutls28-dev \
-        libargon2-0-dev \
-        libcanberra-gtk3-dev \
+        libargon2-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 \
+        libtool \
         gettext \
         libsystemd-dev \
         libsdbus-c++-bin \
@@ -53,6 +52,8 @@ RUN add-apt-repository universe && \
         libswscale-dev \
         libavdevice-dev \
         libopus-dev \
+        libx264-dev \
+        libpipewire-0.3-dev \
         libudev-dev \
         libjsoncpp-dev \
         libmsgpack-dev \
@@ -60,7 +61,6 @@ RUN add-apt-repository universe && \
         libayatana-appindicator3-dev \
         libqrencode-dev \
         libnm-dev \
-        libwebkit2gtk-4.0-dev \
         libcrypto++-dev \
         libva-dev \
         libvdpau-dev \
@@ -70,13 +70,12 @@ RUN add-apt-repository universe && \
         libasio-dev \
         libexpat1 libexpat1-dev \
         lcov gcovr \
+        libxcb-shape0-dev \
+        libwebrtc-audio-processing-dev \
+        libcppunit-dev \
+        libarchive-dev \
         ninja-build
 
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
-
-RUN ls -la /usr/include/c++/8/charconv
-
 RUN apt-get install -y python3 python3-pip python3-setuptools \
                        python3-wheel
 RUN pip3 install meson
@@ -84,6 +83,5 @@ RUN pip3 install meson
 # Tests framework
 RUN apt-get install -y -o Acquire::Retries=10 \
         libcppunit-dev \
-        sip-tester
-
-RUN apt-get clean
+        sip-tester && \
+    apt-get clean