diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6d3cd1..0c33383 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@
 #                                      #
 ########################################
 
-.templates_sha: &template_sha 9f0eb526291fe74651fe1430cbd2397f4c0a819b # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha c6aeb16f86e32525fa630fb99c66c4f3e62fc3cb
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -50,8 +50,8 @@ variables:
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular
   # libinput version
-  FEDORA_TAG:  '2024-09-11.0'
-  DEBIAN_TAG:  '2024-09-11.0'
+  FEDORA_TAG:  '2025-05-19.1'
+  DEBIAN_TAG:  '2025-05-19.1'
 
   FDO_UPSTREAM_REPO: libinput/libei
 
@@ -168,14 +168,14 @@ python-ruff:
 # Build distribution-specific images used by the jobs in the build stage
 #
 
-fedora:40@container-prep:
+fedora:42@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '42'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: 'pip install $FEDORA_PIP_PACKAGES'
@@ -226,12 +226,12 @@ debian:bullseye@container-prep:
     - .build@template
   variables:
     MESON_TEST_ARGS: '--no-suite=python'
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '42'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:40@container-prep"
+    - "fedora:42@container-prep"
 
-default-build-release@fedora:40:
+default-build-release@fedora:42:
   stage: distro
   extends:
     - .fedora-build@template
@@ -239,13 +239,13 @@ default-build-release@fedora:40:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror -Wno-error=vla-parameter"  # munit triggers -Wvla-parameter
 
-build-no-libxkcommon-nodeps@fedora:40:
+build-no-libxkcommon-nodeps@fedora:42:
   extends:
     - .fedora-build@template
   before_script:
     - dnf remove -y libxkcommon-devel
 
-build-no-doxygen@fedora:40:
+build-no-doxygen@fedora:42:
   extends:
     - .fedora-build@template
   variables:
@@ -253,7 +253,7 @@ build-no-doxygen@fedora:40:
   before_script:
     - dnf remove -y doxygen
 
-build-disable-features@fedora:40:
+build-disable-features@fedora:42:
   extends:
     - .fedora-build@template
   parallel:
@@ -264,7 +264,7 @@ build-disable-features@fedora:40:
   variables:
     MESON_ARGS: '-D${FEATURE}=disabled'
 
-valgrind@fedora:40:
+valgrind@fedora:42:
   extends:
     - .fedora-build@template
   variables:
@@ -272,20 +272,20 @@ valgrind@fedora:40:
   before_script:
     - dnf install -y valgrind
 
-pytest@fedora:40:
+pytest@fedora:42:
   extends:
     - .fedora-build@template
   variables:
     MESON_TEST_ARGS: '--suite=python'
 
-werror@fedora:40:
+werror@fedora:42:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: '-Dwerror=true'
   allow_failure: true
 
-abicheck@fedora:40:
+abicheck@fedora:42:
   extends:
     - .fedora-build@template
   before_script:
@@ -304,7 +304,7 @@ abicheck@fedora:40:
   only:
     - merge_requests
 
-event-type-check@fedora:40:
+event-type-check@fedora:42:
   extends:
     - .fedora-build@template
   script:
@@ -342,24 +342,24 @@ minimum-meson@debian:bullseye:
 #                                                               #
 #################################################################
 
-fedora:40@default-build:
+fedora:42@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '42'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:40@container-prep"
+    - "fedora:42@container-prep"
 
-fedora:40@doc-build:
+fedora:42@doc-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '42'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     MESON_ARGS: "-Ddocumentation=protocol,api"
   script:
@@ -394,15 +394,15 @@ pages:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '42'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     MESON_ARGS: "-Ddocumentation=protocol,api"
   script:
     - echo "Nothing to do"
   dependencies:
-    - "fedora:40@doc-build"
+    - "fedora:42@doc-build"
   needs:
-    - "fedora:40@doc-build"
+    - "fedora:42@doc-build"
   only:
     refs:
       - main
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index daa0c6a..b97bc5e 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -8,7 +8,7 @@
 #                                      #
 ########################################
 
-.templates_sha: &template_sha 9f0eb526291fe74651fe1430cbd2397f4c0a819b # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha c6aeb16f86e32525fa630fb99c66c4f3e62fc3cb
 
 include:
   - project: 'freedesktop/ci-templates'
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 42db0bc..1acac50 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,7 +3,7 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2024-09-11.0'
+.default_tag: &default_tag '2025-05-19.1'
 
 last_abi_break: abe85e051e7029bfd2e7913ab980a9e0042b6d0d
 minimum_meson_version: 0.57.0
@@ -12,7 +12,7 @@ distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '40' # update the pages job when bumping the version
+      - '42' # update the pages job when bumping the version
     use_for_custom_build_tests: true
     packages:
       - git
@@ -63,4 +63,4 @@ distributions:
 
 pages:
   distro: fedora
-  version: 40
+  version: 42