diff --git a/.github/workflows/nss-cmsutil-test.yml b/.github/workflows/nss-cmsutil-test.yml
index 62cc91d9..da95c1d3 100644
--- a/.github/workflows/nss-cmsutil-test.yml
+++ b/.github/workflows/nss-cmsutil-test.yml
@@ -367,4 +367,4 @@ jobs:
       with:
         name: nss-cmsutil-test-artifacts
         path: /tmp/nss-cmsutil-test-artifacts.tar.gz
-        retention-days: 30
+        retention-days: 5
diff --git a/.github/workflows/nss-pdfsig-test.yml b/.github/workflows/nss-pdfsig-test.yml
index f3d5847f..267aaa0d 100644
--- a/.github/workflows/nss-pdfsig-test.yml
+++ b/.github/workflows/nss-pdfsig-test.yml
@@ -312,4 +312,4 @@ jobs:
           /tmp/test.pdf
           /tmp/signed.pdf
           /tmp/*.log
-        retention-days: 7
+        retention-days: 5
diff --git a/.github/workflows/nss-ssltap-test.yml b/.github/workflows/nss-ssltap-test.yml
index 33d7a7ae..7c77b867 100644
--- a/.github/workflows/nss-ssltap-test.yml
+++ b/.github/workflows/nss-ssltap-test.yml
@@ -340,7 +340,7 @@ jobs:
         echo "========================================"
 
     - name: Upload test logs
-      if: always()
+      if: failure()
       uses: actions/upload-artifact@v4
       with:
         name: nss-ssltap-test-logs