diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index b2559cad6..a3a0e75b2 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:bookworm
 
 RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     bindfs \
@@ -37,6 +37,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     python3-pip \
     python3-setuptools \
     python3-wheel \
+    reuse \
     shared-mime-info \
     shellcheck \
     systemtap-sdt-dev \
@@ -66,10 +67,7 @@ RUN locale-gen de_DE.UTF-8 \
 
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
-RUN pip3 install meson==0.60.3
-
-# FIXME: Once we use Debian Bookworm, we can just install the `reuse` package
-RUN pip3 install reuse==1.0.0
+RUN pip3 install --break-system-packages meson==0.60.3
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 85f910cb9..d6d6da7ce 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:37
 
 RUN dnf -y update \
  && dnf -y install \
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
index b109122fc..6ebd452a7 100644
--- a/.gitlab-ci/mingw.Dockerfile
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -1,72 +1,17 @@
-FROM fedora:34
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v21
+
+USER root
 
 RUN dnf -y install \
-    bindfs \
-    clang \
-    clang-analyzer \
-    desktop-file-utils \
-    elfutils-libelf-devel \
-    findutils \
-    fuse \
-    gcc \
-    gcc-c++ \
-    gettext \
-    git \
-    glibc-devel \
-    glibc-headers \
-    glibc-langpack-de \
-    glibc-langpack-el \
-    glibc-langpack-el \
-    glibc-langpack-en \
-    glibc-langpack-es \
-    glibc-langpack-es \
-    glibc-langpack-fa \
-    glibc-langpack-fr \
-    glibc-langpack-hr \
-    glibc-langpack-ja \
-    glibc-langpack-lt \
-    glibc-langpack-pl \
-    glibc-langpack-ru \
-    glibc-langpack-tr \
-    gtk-doc \
-    itstool \
-    lcov \
-    libattr-devel \
-    libffi-devel \
-    libmount-devel \
-    libselinux-devel \
-    libxslt \
     mingw64-gcc \
     mingw64-gcc-c++ \
     mingw64-gettext \
     mingw64-libffi \
     mingw64-zlib \
-    ncurses-compat-libs \
-    ninja-build \
-    pcre2-devel \
-    python3 \
-    python3-pip \
-    python3-wheel \
-    systemtap-sdt-devel \
-    unzip \
-    wget \
-    xz \
-    zlib-devel \
  && dnf clean all
 
 WORKDIR /opt
 COPY cross_file_mingw64.txt /opt
 
-RUN pip3 install meson==0.60.3
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
 USER user
-WORKDIR /home/user
-
-COPY cache-subprojects.sh .
-RUN ./cache-subprojects.sh
-
-ENV LANG C.UTF-8
+WORKDIR /home/user
\ No newline at end of file