diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3acd44b646..9a23201197 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -147,7 +147,7 @@ jobs:
                 -cvf binpkgs.tar .
 
       - name: Extract build logs
-        if: always()
+        if: always() && !cancelled()
         shell: bash
         run: |
           set -euo pipefail
@@ -158,7 +158,7 @@ jobs:
               /build/${arch}-usr/var/tmp/portage
 
       - name: Upload build logs
-        if: always()
+        if: always() && !cancelled()
         uses: actions/upload-artifact@v3
         with:
           retention-days: 7
diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml
index 8f4234a5e7..35d624b366 100644
--- a/.github/workflows/run-kola-tests.yaml
+++ b/.github/workflows/run-kola-tests.yaml
@@ -243,7 +243,7 @@ jobs:
           set -e
 
       - name: Upload detailed test logs
-        if: always()
+        if: always() && !cancelled()
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.arch }}-test-logs-and-results
@@ -255,7 +255,7 @@ jobs:
             scripts/results-*.md
 
       - name: Upload raw TAP files of all runs for later merging
-        if: always()
+        if: always() && !cancelled()
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.arch }}-raw-tapfiles
@@ -266,7 +266,7 @@ jobs:
   merge_and_publish_results:
     name: "Merge TAP reports and post results"
     needs: tests
-    if: always()
+    if: always() && !cancelled()
     runs-on:
       - self-hosted
       - debian
diff --git a/.github/workflows/update-sdk.yaml b/.github/workflows/update-sdk.yaml
index 3465c86fad..8c039463a6 100644
--- a/.github/workflows/update-sdk.yaml
+++ b/.github/workflows/update-sdk.yaml
@@ -121,6 +121,7 @@ jobs:
               target_version="${CUSTOM_SDK_VERSION}"
           fi
 
+          echo "setting sdk_version=${target_version} as a github output"
           echo "sdk_version=${target_version}" >> "$GITHUB_OUTPUT"
 
           # This also updates sdk_container/.repo/manifests/version.txt with the new SDK version.