diff --git a/.github/mergify.yml b/.github/mergify.yml
index c11bb07d..aa410900 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -7,8 +7,8 @@ queue_rules:
   - name: default
     conditions:
       - check-success=check-commits
-      - check-success=test (fedora-41)
-      - check-success=test (fedora-40)
+      - check-success=test (fedora-latest)
+      - check-success=test (fedora-previous)
       - check-success=test (centos-stream9)
       - check-success=dpulls
     merge_method: rebase
@@ -28,8 +28,8 @@ pull_request_rules:
   - name: Automatic merge on approval
     conditions:
       - check-success=check-commits
-      - check-success=test (fedora-41)
-      - check-success=test (fedora-40)
+      - check-success=test (fedora-latest)
+      - check-success=test (fedora-previous)
       - check-success=test (centos-stream9)
       - check-success=dpulls
       - "-draft"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c132eac..2977ca90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,20 @@ on:
     - cron: 1 1 * * *
 
 jobs:
+  fedora-versions:
+    runs-on: ubuntu-latest
+    steps:
+      - id: fedora-versions
+        run: |
+          curl -s -L https://fedoraproject.org/releases.json -o fedora-releases.json
+          LATEST=$(jq -r '[.[]|select(.variant == "Container" and .subvariant == "Container_Base" and .arch == "x86_64")][0]|.version' fedora-releases.json)
+          PREVIOUS=$((LATEST - 1))
+
+          echo "latest=$LATEST" >> $GITHUB_OUTPUT
+          echo "previous=$PREVIOUS" >> $GITHUB_OUTPUT
+    outputs:
+      latest: ${{ steps.fedora-versions.outputs.latest }}
+      previous: ${{ steps.fedora-versions.outputs.previous }}
   check-commits:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
@@ -24,16 +38,17 @@ jobs:
       - name: Run gitlint
         run: tox -e gitlint
   test:
+    needs: fedora-versions
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        test_distro: ["fedora-40", "fedora-41", "centos-stream9"]
+        test_distro: ["fedora-previous", "fedora-latest", "centos-stream9"]
         include:
-          - test_distro: "fedora-40"
-            base_image: "registry.fedoraproject.org/fedora:40"
-          - test_distro: "fedora-41"
-            base_image: "registry.fedoraproject.org/fedora:41"
+          - test_distro: "fedora-previous"
+            base_image: "registry.fedoraproject.org/fedora:${{ needs.fedora-versions.outputs.previous }}"
+          - test_distro: "fedora-latest"
+            base_image: "registry.fedoraproject.org/fedora:${{ needs.fedora-versions.outputs.latest }}"
           - test_distro: "centos-stream9"
             base_image: "quay.io/centos/centos:stream9"
     steps: