diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c073fbed0..f195a3374f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,9 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v30"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v30"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31"
 
 .only-default:
   only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 4d7937286d..4f2aece467 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -10,6 +10,7 @@ RUN dnf -y install \
     ccache \
     clang \
     clang-analyzer \
+    clang-tools-extra \
     colord-devel \
     cups-devel \
     dbus-daemon \