diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 9db494850..aac64c520 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -67,7 +67,7 @@ jobs:
             runner: ubuntu-24.04-arm
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - uses: systemd/mkosi@main
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 679ecbd66..d74b6ea6e 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -22,61 +22,66 @@ jobs:
             efiarch: aa64
             gccarch: aarch64
             makearch: aarch64
-            distro: f41
+            distro: f45
           - arch: amd64
             efiarch: aa64
             gccarch: aarch64
             makearch: aarch64
-            distro: f40
+            distro: f44
+          - arch: amd64
+            efiarch: aa64
+            gccarch: aarch64
+            makearch: aarch64
+            distro: f43
           - arch: amd64
             efiarch: arm
             gccarch: arm
             makearch: arm
-            distro: f41
+            distro: f45
           - arch: amd64
             efiarch: arm
             gccarch: arm
             makearch: arm
-            distro: f40
+            distro: f44
           - arch: amd64
             efiarch: arm
             gccarch: arm
             makearch: arm
-            distro: f39
+            distro: f43
           - arch: amd64
             efiarch: x64
             gccarch: x86_64
             makearch: x86_64
-            distro: f41
+            distro: f45
           - arch: amd64
             efiarch: x64
             gccarch: x86_64
             makearch: x86_64
-            distro: f40
+            distro: f44
           - arch: amd64
             efiarch: x64
             gccarch: x86_64
             makearch: x86_64
-            distro: f39
+            distro: f43
           - arch: amd64
             efiarch: ia32
             gccarch: x86_64
             makearch: ia32
-            distro: f41
+            distro: f45
           - arch: amd64
             efiarch: ia32
             gccarch: x86_64
             makearch: ia32
-            distro: f40
+            distro: f44
           - arch: amd64
             efiarch: ia32
             gccarch: x86_64
             makearch: ia32
-            distro: f39
+            distro: f43
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger)
           ref: ${{ github.event.pull_request.head.sha }}
@@ -117,20 +122,25 @@ jobs:
     name: ${{ matrix.distro }} ${{ matrix.efiarch }} build
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: f41
+            distro: f45
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: f40
+            distro: f44
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: f39
+            distro: f43
+          - arch: amd64
+            efiarch: x64
+            makearch: x86_64
+            distro: centos10
           - arch: amd64
             efiarch: x64
             makearch: x86_64
@@ -142,7 +152,15 @@ jobs:
           - arch: amd64
             efiarch: ia32
             makearch: ia32
-            distro: f39
+            distro: f45
+          - arch: amd64
+            efiarch: ia32
+            makearch: ia32
+            distro: f44
+          - arch: amd64
+            efiarch: ia32
+            makearch: ia32
+            distro: f43
           - arch: amd64
             efiarch: ia32
             makearch: ia32
@@ -150,7 +168,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger)
           ref: ${{ github.event.pull_request.head.sha }}
@@ -189,16 +207,25 @@ jobs:
     name: ${{ matrix.distro }} ${{ matrix.efiarch }} build compile_commands.json
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: f41
+            distro: f45
+          - arch: amd64
+            efiarch: x64
+            makearch: x86_64
+            distro: f44
+          - arch: amd64
+            efiarch: x64
+            makearch: x86_64
+            distro: f43
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger)
           ref: ${{ github.event.pull_request.head.sha }}
diff --git a/lib/string.c b/lib/string.c
index d941cd566..62c862b8e 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -17,6 +17,9 @@
 #define strncmp shim_strncmp
 #define strncasecmp shim_strncasecmp
 #define strcasecmp shim_strcasecmp
+#ifdef strrchr
+#undef strrchr
+#endif
 #define strrchr shim_strrchr
 #define strlen shim_strlen
 #define strnlen shim_strnlen