diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81cc3e07dc..cd7439ee40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 include:
   - project: 'freedesktop/ci-templates'
-    ref: "801093be0b88f23c8dbabe9cfce7134548f7ccdc"
+    ref: "3826695f80807d8a4d999f6b6efb3d405d708db9"
     file: '/templates/fedora.yml'
   - project: 'freedesktop/ci-templates'
-    ref: "801093be0b88f23c8dbabe9cfce7134548f7ccdc"
+    ref: "3826695f80807d8a4d999f6b6efb3d405d708db9"
     file: '/templates/debian.yml'
   ###
   # IMPORTANT
@@ -130,8 +130,8 @@ trigger:
 .fedora image:
   variables:
     CCACHE_DIR: '/cache/gstreamer/gstreamer/ccache/'
-    FDO_BASE_IMAGE: 'registry.fedoraproject.org/fedora-toolbox:34'
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_BASE_IMAGE: 'registry.fedoraproject.org/fedora-toolbox:40'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_REPO_SUFFIX: "$FEDORA_AMD64_SUFFIX"
     FDO_DISTRIBUTION_TAG: "$FEDORA_TAG-$GST_UPSTREAM_BRANCH"
     FDO_DISTRIBUTION_EXEC: 'GIT_BRANCH=$CI_COMMIT_REF_NAME GIT_URL=$CI_REPOSITORY_URL bash ci/docker/fedora/prepare.sh'
@@ -441,7 +441,6 @@ build fedora clang:
         BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"]
         MESON_ARGS: >-
           ${SIMPLE_BUILD}
-          --force-fallback-for=glib
 
       - BUILD_TYPE: ["--default-library=static"]
         BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"]
@@ -457,7 +456,6 @@ build fedora clang:
           -Dpython=disabled
           -Ddoc=disabled
           -Dgstreamer-sharp:tests=disabled
-          --force-fallback-for=glib
 
 build debian x86_64:
   extends:
diff --git a/ci/docker/fedora/deps.txt b/ci/docker/fedora/deps.txt
index e091427284..de4ce5f82d 100644
--- a/ci/docker/fedora/deps.txt
+++ b/ci/docker/fedora/deps.txt
@@ -4,18 +4,25 @@ bat
 bison
 busybox
 ccache
+clang-analyzer
 clang-devel
+clang-tidy-sarif
+clang-tools-extra-devel
 cmake
 curl
 dnf-plugins-core
 elfutils
 elfutils-devel
 faac-devel
+fdk-aac
+fdk-aac-devel
 ffmpeg
 ffmpeg-devel
 ffmpeg-libs
 flex
 flite-devel
+fluidsynth
+fluidsynth-devel
 gcc
 gcc-c++
 gdb
@@ -80,7 +87,6 @@ python3-devel
 python3-gobject
 python3-pip
 python3-wheel
-qconf
 qemu-system-x86
 qt5-linguist
 qt5-qtbase-devel
@@ -95,14 +101,21 @@ sbc-devel
 SDL2-devel
 srt-devel
 srt-libs
-toolbox-experience
+svt-av1
+svt-av1-devel
+svt-hevc
+svt-hevc-devel
+svt-hevc-libs
+svt-hevc-libs
+svt-vp9
+svt-vp9-devel
+svt-vp9-libs
 valgrind
 vulkan-devel
 vulkan-loader
 x264
 x264-devel
-x265
 x264-devel
-xorg-x11-server-utils
+x265
 xorg-x11-server-Xvfb
 xset
diff --git a/ci/docker/fedora/install-deps.sh b/ci/docker/fedora/install-deps.sh
index 2440de194b..8471e36af9 100644
--- a/ci/docker/fedora/install-deps.sh
+++ b/ci/docker/fedora/install-deps.sh
@@ -13,23 +13,25 @@ sudo dnf install -y \
   "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm"
 
 dnf upgrade -y && dnf distro-sync -y
-dnf install -y $(<./ci/docker/fedora/deps.txt)
 
 # Install the dependencies of gstreamer
-dnf builddep -y gstreamer1 \
-    gstreamer1-plugins-base \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-good-extras \
-    gstreamer1-plugins-good-qt \
-    gstreamer1-plugins-ugly \
-    gstreamer1-plugins-ugly-free \
+dnf builddep -y --skip-broken --allowerasing --best \
+    gstreamer1 \
     gstreamer1-plugins-bad-free \
     gstreamer1-plugins-bad-free-extras \
     gstreamer1-plugins-bad-freeworld \
-    gstreamer1-libav \
-    gstreamer1-rtsp-server  \
-    gstreamer1-vaapi \
-    python3-gstreamer1
+    gstreamer1-plugins-base \
+    gstreamer1-plugins-good \
+    gstreamer1-plugins-good-extras \
+    gstreamer1-plugins-ugly \
+    gstreamer1-plugins-ugly-free \
+    gstreamer1-rtsp-server
+
+dnf remove -y \
+    'ffmpeg-free*' \
+    'fdk-aac-free*'
+
+dnf install -y $(<./ci/docker/fedora/deps.txt)
 
 dnf remove -y meson -x ninja-build
 pip3 install meson hotdoc python-gitlab tomli junitparser
@@ -46,6 +48,7 @@ debug_packages=$(rpm -qa | grep -v -i \
     -e bluez \
     -e boost \
     -e ccache \
+    -e ceph \
     -e clang \
     -e cmake \
     -e colord \
@@ -86,6 +89,7 @@ debug_packages=$(rpm -qa | grep -v -i \
     -e qemu \
     -e qt5 \
     -e qt6 \
+    -e sequoia \
     -e spice \
     -e sqlite \
     -e suitesparse \
@@ -107,5 +111,4 @@ dnf debuginfo-install -y --best --allowerasing --skip-broken $debug_packages
 echo "Removing DNF cache"
 dnf clean all
 
-rm -R /root/*
 rm -rf /var/cache/dnf /var/log/dnf*
diff --git a/ci/docker/fedora/install-gdk-pixbuf.sh b/ci/docker/fedora/install-gdk-pixbuf.sh
deleted file mode 100644
index b9c513d4be..0000000000
--- a/ci/docker/fedora/install-gdk-pixbuf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-set -eux
-
-# Install gdk-pixbuf manually as fedora 34 doesn't build the docs/.devhelp2
-git clone --branch gdk-pixbuf-2-40 https://gitlab.gnome.org/GNOME/gdk-pixbuf.git
-cd gdk-pixbuf
-meson setup _build --prefix=/usr -Ddocs=true
-meson install -C _build
-cd ..
-rm -rf gdk-pixbuf
diff --git a/ci/docker/fedora/install-wayland-protocols.sh b/ci/docker/fedora/install-wayland-protocols.sh
deleted file mode 100644
index 8109a69d4a..0000000000
--- a/ci/docker/fedora/install-wayland-protocols.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-set -eux
-
-# Install a more up to date wayland-protocols
-git clone --branch 1.32 https://gitlab.freedesktop.org/wayland/wayland-protocols.git
-cd wayland-protocols
-meson setup _build --prefix=/usr -Dtests=false
-meson install -C _build
-cd ..
-rm -rf wayland-protocols
diff --git a/ci/docker/fedora/prepare.sh b/ci/docker/fedora/prepare.sh
index cdb5c91b04..096c130f57 100644
--- a/ci/docker/fedora/prepare.sh
+++ b/ci/docker/fedora/prepare.sh
@@ -8,10 +8,6 @@ git config --global user.name "Gstbuild Runner"
 
 bash ./ci/docker/fedora/install-deps.sh
 
-bash ./ci/docker/fedora/install-gdk-pixbuf.sh
-
-bash ./ci/docker/fedora/install-wayland-protocols.sh
-
 bash ./ci/scripts/install-rust.sh
 
 bash ./ci/docker/fedora/virtme-fluster-setup.sh