diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 271f5adc..24d89b91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,17 +237,6 @@ pre-commit-hooks:
 #                                                               #
 #################################################################
 
-fedora:39@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-    - .policy
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '39'
-    FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:40@container-prep:
   extends:
     - .fdo.container-build@fedora
@@ -259,6 +248,17 @@ fedora:40@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
+fedora:41@container-prep:
+  extends:
+    - .fdo.container-build@fedora
+    - .policy
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '41'
+    FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+
 debian:stable@container-prep:
   extends:
     - .fdo.container-build@debian
@@ -348,16 +348,6 @@ freebsd:13.2@container-prep:
   only:
     - schedules
 
-fedora:39@container-clean:
-  extends:
-    - .policy
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '39'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:40@container-clean:
   extends:
     - .policy
@@ -368,6 +358,16 @@ fedora:40@container-clean:
     FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
+fedora:41@container-clean:
+  extends:
+    - .policy
+    - .container-clean
+  variables:
+    GIT_STRATEGY: none
+    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+    FDO_DISTRIBUTION_VERSION: '41'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+
 debian:stable@container-clean:
   extends:
     - .policy
@@ -532,20 +532,20 @@ freebsd:13.2@container-clean:
     - export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES"
 
 
-.fedora:40@test-suite-vm:
+.fedora:41@test-suite-vm:
   extends:
     - .fdo.distribution-image@fedora
     - .test-suite-vm
   variables:
-    FDO_DISTRIBUTION_VERSION: 40
+    FDO_DISTRIBUTION_VERSION: 41
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:40@container-prep"
+    - "fedora:41@container-prep"
 
 
 vm-touchpad:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad'
 
@@ -558,7 +558,7 @@ vm-touchpad-no-libwacom:
 
 vm-touchpad_palm:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad_palm'
 
@@ -571,7 +571,7 @@ vm-touchpad_palm-no-libwacom:
 
 vm-touchpad_dwt:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad_dwt'
 
@@ -584,7 +584,7 @@ vm-touchpad_dwt-no-libwacom:
 
 vm-tap:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad_tap'
 
@@ -597,7 +597,7 @@ vm-tap-no-libwacom:
 
 vm-tap-drag:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad_tap_drag'
 
@@ -610,7 +610,7 @@ vm-tap-drag-no-libwacom:
 
 vm-tap-palm:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad_tap_palm'
 
@@ -623,7 +623,7 @@ vm-tap-palm-no-libwacom:
 
 vm-touchpad-buttons:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad_buttons'
 
@@ -636,7 +636,7 @@ vm-touchpad-buttons-no-libwacom:
 
 vm-tablet:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'tablet'
 
@@ -649,7 +649,7 @@ vm-tablet-no-libwacom:
 
 vm-tablet_left_handed:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'tablet_left_handed'
 
@@ -662,7 +662,7 @@ vm-tablet_left_handed-no-libwacom:
 
 vm-gestures:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'gestures'
 
@@ -675,7 +675,7 @@ vm-gestures-no-libwacom:
 
 vm-backends:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'path udev'
 
@@ -688,7 +688,7 @@ vm-backends-no-libwacom:
 
 vm-misc:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'log misc quirks device'
 
@@ -701,7 +701,7 @@ vm-misc-no-libwacom:
 
 vm-other devices:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
 
@@ -714,7 +714,7 @@ vm-other devices-no-libwacom:
 
 vm-pointer:
   extends:
-    - .fedora:40@test-suite-vm
+    - .fedora:41@test-suite-vm
   variables:
     SUITE_NAMES: 'pointer'
 
@@ -900,12 +900,12 @@ vm-valgrind-pointer:
     - .fdo.distribution-image@fedora
     - .build@template
   variables:
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '41'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:40@container-prep"
+    - "fedora:41@container-prep"
 
-default-build-release@fedora:40:
+default-build-release@fedora:41:
   stage: distro
   extends:
     - .fedora-build@template
@@ -913,7 +913,7 @@ default-build-release@fedora:40:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror"
 
-scan-build@fedora:40:
+scan-build@fedora:41:
   extends:
     - .fedora-build@template
   variables:
@@ -930,13 +930,13 @@ scan-build@fedora:40:
 # run them on one image, they shouldn't fail on one distro
 # when they succeed on another.
 
-build-no-libwacom@fedora:40:
+build-no-libwacom@fedora:41:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dlibwacom=false"
 
-build-no-libwacom-nodeps@fedora:40:
+build-no-libwacom-nodeps@fedora:41:
   extends:
     - .fedora-build@template
   variables:
@@ -944,13 +944,13 @@ build-no-libwacom-nodeps@fedora:40:
   before_script:
     - dnf remove -y libwacom libwacom-devel
 
-build-docs@fedora:40:
+build-docs@fedora:41:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddocumentation=true"
 
-build-no-docs-nodeps@fedora:40:
+build-no-docs-nodeps@fedora:41:
   extends:
     - .fedora-build@template
   variables:
@@ -958,13 +958,13 @@ build-no-docs-nodeps@fedora:40:
   before_script:
     - dnf remove -y doxygen graphviz
 
-build-no-debuggui@fedora:40:
+build-no-debuggui@fedora:41:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddebug-gui=false"
 
-build-no-debuggui-nodeps@fedora:40:
+build-no-debuggui-nodeps@fedora:41:
   extends:
     - .fedora-build@template
   variables:
@@ -972,13 +972,13 @@ build-no-debuggui-nodeps@fedora:40:
   before_script:
     - dnf remove -y gtk3-devel gtk4-devel
 
-build-no-tests@fedora:40:
+build-no-tests@fedora:41:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dtests=false"
 
-build-no-tests-nodeps@fedora:40:
+build-no-tests-nodeps@fedora:41:
   extends:
     - .fedora-build@template
   variables:
@@ -986,7 +986,7 @@ build-no-tests-nodeps@fedora:40:
   before_script:
     - dnf remove -y check-devel
 
-valgrind@fedora:40:
+valgrind@fedora:41:
   extends:
     - .fedora-build@template
   variables:
@@ -994,7 +994,7 @@ valgrind@fedora:40:
 
 # Python checks, only run on Fedora
 
-usr-bin-env-python@fedora:40:
+usr-bin-env-python@fedora:41:
   extends:
     - .fedora-build@template
   script:
@@ -1004,7 +1004,7 @@ usr-bin-env-python@fedora:40:
         /bin/false
       fi
 
-python-format@fedora:40:
+python-format@fedora:41:
   extends:
     - .fedora-build@template
   script:
@@ -1107,18 +1107,6 @@ coverity:
 #                                                               #
 #################################################################
 
-fedora:39@default-build:
-  stage: distro
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '39'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:39@container-prep"
-
-
 fedora:40@default-build:
   stage: distro
   extends:
@@ -1131,6 +1119,18 @@ fedora:40@default-build:
     - "fedora:40@container-prep"
 
 
+fedora:41@default-build:
+  stage: distro
+  extends:
+    - .build@template
+    - .fdo.distribution-image@fedora
+  variables:
+    FDO_DISTRIBUTION_VERSION: '41'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+  needs:
+    - "fedora:41@container-prep"
+
+
 debian:stable@default-build:
   stage: distro
   extends:
@@ -1227,10 +1227,10 @@ build rpm:
     - .policy
   stage: deploy
   variables:
-    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_VERSION: '41'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:40@container-prep"
+    - "fedora:41@container-prep"
   script:
     - meson "$MESON_BUILDDIR"
     - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version)
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index be363a63..0e24e959 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -9,8 +9,8 @@ distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '39'
       - '40'
+      - '41'
     use_for_custom_build_tests: true
     use_for_qemu_tests: true
     packages: