diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac02baa03e8f003d37a4e453d29c28c7fe3a12a0..77e6675892e31c53e32257a18c78910aec8a0766 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,12 +14,12 @@ build-container:
     # CI_REGISTRY_PASSWORD=********
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
     LATEST_TAG: $CI_REGISTRY_IMAGE:latest
-  image: docker:20.10.9
+  image: docker:20.10.14
   # The container build is in the .pre stage in order to ensure it is
   # subsequently used for the included build.
   stage: .pre
   services:
-    - docker:20.10.9-dind
+    - docker:20.10.14-dind
   script:
     - docker build -t $IMAGE_TAG -t $LATEST_TAG .
     # Export the API docs to the runner so we can publish them
diff --git a/Dockerfile b/Dockerfile
index 1e2133546beab93b75326e1f7832b6191be4b909..41b564e22e3801173812dc57c1dda402c26cc11b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,13 @@
-FROM ubuntu:focal
+FROM ubuntu:22.04
 MAINTAINER Xfce Development Team
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Enable source repositories
-RUN sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
-
-# Set up dependencies for the "xfce" and "app" groups
+# Set up dependencies for xfce components
 RUN apt-get update \
-  && apt-get -y --no-install-recommends install git libglib2.0-bin build-essential libgtk-3-dev gtk-doc-tools libx11-dev libglib2.0-dev libwnck-3-dev intltool liburi-perl x11-xserver-utils libvte-2.91-dev dbus-x11 cmake libsoup2.4-dev libpcre2-dev libgtksourceview-3.0-dev libgtksourceview-4-dev libtag1-dev xvfb autopoint \
-  && apt-get -y --no-install-recommends install gir1.2-gstreamer-1.0 libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libgstreamer-plugins-base1.0-dev libgstreamer1.0-0 libgstreamer1.0-dev \
-  python3-distutils-extra python3-dev python-gi-dev libxss-dev libindicator3-dev libxmu-dev libburn-dev libisofs-dev  libpulse-dev libkeybinder-3.0-dev libmpd-dev valac libvala-0.48-dev gobject-introspection libgirepository1.0-dev librsvg2-dev libtagc0-dev libdbusmenu-gtk3-dev libgtop2-dev libtool libnotify-dev libxklavier-dev libexif-dev libgudev-1.0-dev libupower-glib-dev libclutter-1.0-dev libsensors4-dev \
+  && apt-get -y --no-install-recommends install build-essential git libglib2.0-bin python3-distutils-extra python3-dev python-gi-dev libxss-dev libxml2-utils libgtk-3-dev gtk-doc-tools libx11-dev libglib2.0-dev libwnck-3-dev intltool liburi-perl  x11-xserver-utils libvte-2.91-dev dbus-x11 cmake libpcre2-dev libsoup2.4-dev libtool \
+  libgtksourceview-4-dev libgtk-4-dev libgtksourceview-5-dev libtag1-dev xvfb autopoint gir1.2-gstreamer-1.0 libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libgstreamer-plugins-base1.0-dev libgstreamer1.0-0 libgstreamer1.0-dev \
+  libxss-dev libindicator3-dev libxmu-dev libburn-dev libisofs-dev  libpulse-dev libkeybinder-3.0-dev libmpd-dev valac libvala-0.56-dev gobject-introspection libgirepository1.0-dev librsvg2-dev libtagc0-dev libdbusmenu-gtk3-dev libgtop2-dev libnotify-dev libxklavier-dev libexif-dev libgudev-1.0-dev libupower-glib-dev libclutter-1.0-dev libsensors4-dev \
   && rm -rf /var/lib/apt/lists/*
 
 # Build and install the latest tag for all Xfce core libraries