diff --git a/.github/workflows/cross-cloud-tests.yaml b/.github/workflows/cross-cloud-tests.yaml
index f1628f3f3..ea86c1e6f 100644
--- a/.github/workflows/cross-cloud-tests.yaml
+++ b/.github/workflows/cross-cloud-tests.yaml
@@ -194,9 +194,23 @@ jobs:
           export COMMIT_HASH=${{ github.sha }}
 
           chainsaw test tests/e2e/${{ matrix.test-scenario }}
+      
+      - name: Run diagnose command
+        if: always()
+        run: |
+          ./cli/odigos diagnose
+        continue-on-error: true
+        
+      - name: Upload run details artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: run-details
+          path: odigos_debug*.tar.gz
+        continue-on-error: true
 
       - name: Destroy Resources
-        if: always()  # Ensures this runs even if earlier steps fail
+        if: always()
         run: |
           tofu -chdir=$TF_DIR destroy -auto-approve