diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 8c1113227..dff13d323 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -140,14 +140,14 @@ jobs:
         run: go run ./e2e/cmd/run_tests/98_collect_pam_coverage
         if: ${{ matrix.codename == 'noble' }}
       - name: Upload PAM coverage as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: pam-coverage.zip
           path: ./output/pam-cobertura.xml
         if: ${{ matrix.codename == 'noble' }}
       - name: Collect logs on failure
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: e2e-logs-${{ matrix.codename }}
           path: logs/
diff --git a/.github/workflows/patch-vendored-samba.yaml b/.github/workflows/patch-vendored-samba.yaml
index 511d35767..ef2e74553 100644
--- a/.github/workflows/patch-vendored-samba.yaml
+++ b/.github/workflows/patch-vendored-samba.yaml
@@ -43,7 +43,7 @@ jobs:
           done
       - name: Upload
         if: ${{ steps.compute-diff.outputs.changed == 'true' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: samba
           path: |
diff --git a/.github/workflows/policy-builds.yaml b/.github/workflows/policy-builds.yaml
index e5fed48d8..c04e32067 100644
--- a/.github/workflows/policy-builds.yaml
+++ b/.github/workflows/policy-builds.yaml
@@ -27,7 +27,7 @@ jobs:
           mkdir /tmp/adsys
           CGO_ENABLED=0 go build ./cmd/admxgen/
       - name: Upload admxgen
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: admxgen
           path: |
@@ -124,7 +124,7 @@ jobs:
           artifacts_name=${artifacts_name/:/-}
           echo "artifacts_name=${artifacts_name}" >> $GITHUB_ENV
       - name: Generated definition files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: policies-${{ env.artifacts_name }}
           path: out/*
@@ -171,7 +171,7 @@ jobs:
           artifacts/admxgen/admxgen admx --auto-detect-releases ${allowflag} artifacts/admxgen/cmd/admxgen/defs/categories.yaml wanted/ .
           ls -R
       - name: Upload adm template files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: adm-${{ matrix.releases }}
           path: Ubuntu.adm*
@@ -209,7 +209,7 @@ jobs:
           artifacts/admxgen/admxgen doc artifacts/admxgen/cmd/admxgen/defs/categories.yaml wanted/ generated-docs/
           ls -R
       - name: Upload adm template files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: generated-docs
           path: generated-docs/*
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
index 8f47a3f14..fcf9372c0 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/qa.yaml
@@ -99,7 +99,7 @@ jobs:
           gocov convert "${go_only_cov_file}" | gocov-xml > "${coverage_dir}/coverage.xml"
           reportgenerator -reports:"${coverage_dir}/*.xml" -targetdir:"${cod_cov_dir}" -reporttypes:Cobertura
       - name: Upload XML coverage report as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: coverage.zip
           path: ./coverage/codecov/Cobertura.xml
@@ -154,7 +154,7 @@ jobs:
         # detection enabled and the code is mostly platform independent, this
         # should be a safe action to take.
       - name: Attach installer artifact to workflow run
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: adwatchd_setup
           path: installer/Output/adwatchd_setup.exe