diff --git a/.github/workflows/hil_sample_zephyr.yml b/.github/workflows/hil_sample_zephyr.yml
index 6c046ef9..a34d3ca6 100644
--- a/.github/workflows/hil_sample_zephyr.yml
+++ b/.github/workflows/hil_sample_zephyr.yml
@@ -200,17 +200,12 @@ jobs:
                 --pytest-args="--mask-secrets"                                                    \
                 -v
 
-      - name: Mask secrets in logs
-        id: mask-logs
+      - name: Safe upload twister artifacts
+        id: safe-upload-artifacts
         if: always()
-        uses: ./modules/lib/golioth-firmware-sdk/.github/actions/mask_secrets
+        uses: ./modules/lib/golioth-firmware-sdk/.github/actions/safe-upload-artifacts
         with:
           secrets-json: ${{ toJson(secrets) }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: always() && steps.mask-logs.outcome == 'success'
-        with:
           name: twister-run-artifacts-${{ inputs.hil_board }}
           path: |
             reports/*
@@ -220,15 +215,15 @@ jobs:
             twister-out/*.json
 
       - name: Prepare report summary
-        if: always() && steps.mask-logs.outcome == 'success'
+        if: always()
         run: |
           rm -rf summary
           mkdir summary
           cp twister-out/twister_suite_report.xml summary/samples-zephyr-${{ inputs.hil_board }}.xml
 
-      - name: Upload report summary
-        uses: actions/upload-artifact@v4
-        if: always() && steps.mask-logs.outcome == 'success'
+      - name: Safe upload report summary
+        uses: ./modules/lib/golioth-firmware-sdk/.github/actions/safe-upload-artifacts
+        if: always()
         with:
           name: ci-summary-samples-zephyr-${{ inputs.hil_board }}
           path: summary/*
diff --git a/.github/workflows/hil_tests.yml b/.github/workflows/hil_tests.yml
index 2ae26beb..219d7608 100644
--- a/.github/workflows/hil_tests.yml
+++ b/.github/workflows/hil_tests.yml
@@ -226,17 +226,12 @@ jobs:
               --pytest-args="--api-key=${{ secrets[inputs.api-key-id] }}"           \
               --pytest-args="--mask-secrets"
 
-      - name: Mask secrets in logs
-        id: mask-logs
+      - name: Safe upload twister artifacts
+        id: safe-upload-artifacts
         if: always()
-        uses: ./modules/lib/golioth-firmware-sdk/.github/actions/mask_secrets
+        uses: ./modules/lib/golioth-firmware-sdk/.github/actions/safe-upload-artifacts
         with:
           secrets-json: ${{ toJson(secrets) }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: always() && steps.mask-logs.outcome == 'success'
-        with:
           name: twister-run-artifacts-${{ matrix.artifact_suffix }}
           path: |
             reports/*
@@ -248,20 +243,18 @@ jobs:
             twister-out/*.json
 
       - name: Prepare report summary
-        if: always() && steps.mask-logs.outcome == 'success'
+        if: always()
         run: |
           rm -rf summary
           mkdir summary
           cp twister-out/twister_suite_report.xml summary/samples-zephyr-${{ matrix.artifact_suffix }}.xml
 
-      - name: Upload report summary
-        uses: actions/upload-artifact@v4
-        if: always() && steps.mask-logs.outcome == 'success'
+      - name: Safe upload report summary
+        uses: ./modules/lib/golioth-firmware-sdk/.github/actions/safe-upload-artifacts
+        if: always()
         with:
-          name: ci-summary-samples-zephyr-${{ matrix.artifact_suffix }}
-          path: |
-            summary/*
-
+          name: ci-summary-samples-zephyr-${{ inputs.hil_board }}
+          path: summary/*
 
   hil_sample_zephyr_nsim_coverage:
     runs-on: ubuntu-latest