diff --git a/.github/workflows/xfstests.yaml b/.github/workflows/xfstests.yaml
index 34df07094..f4920794e 100644
--- a/.github/workflows/xfstests.yaml
+++ b/.github/workflows/xfstests.yaml
@@ -31,7 +31,7 @@ jobs:
           - fs/xfstests.py.data/btrfs/ci.yaml
         container:
           - ubuntu:latest
-          - fedora:latest
+          - fedora:40
           - opensuse/leap:latest # Added openSUSE Leap
 
     steps:
@@ -56,8 +56,8 @@ jobs:
           if [[ '${{ matrix.container }}' == 'ubuntu:latest' ]]; then \
             apt-get update && apt-get -y upgrade && apt-get install -y build-essential python3 python3-pip && \
             pip3 install --break-system-packages avocado-framework && pip3 install --break-system-packages avocado-framework-plugin-varianter-yaml-to-mux; \
-          elif [[ '${{ matrix.container }}' == 'fedora:latest' ]]; then \
-            dnf -y update && dnf -y groupinstall 'Development Tools' && dnf -y install python3 python3-pip hostname which && \
+          elif [[ '${{ matrix.container }}' == 'fedora:40' ]]; then \
+            dnf -y update && dnf -y group install "development-tools" && dnf -y install python3 python3-pip hostname which && \
             pip3 install avocado-framework && pip3 install avocado-framework-plugin-varianter-yaml-to-mux; \
           elif [[ '${{ matrix.container }}' == 'opensuse/leap:latest' ]]; then \
             zypper -n update && zypper -n install -t pattern devel_basis && zypper -n install python3 python3-pip hostname which && \
@@ -79,7 +79,7 @@ jobs:
           echo "ARTIFACT_NAME_CONTAINER=$ARTIFACT_NAME_CONTAINER" >> $GITHUB_ENV
 
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "xfstests_${{ env.ARTIFACT_NAME_CONFIG }}_${{ env.ARTIFACT_NAME_CONTAINER }}"
           path: ./avocado-results/