diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
index bdb1f6e7ba6..fc5cd1f648a 100644
--- a/.github/workflows/e2e-upgrade.yml
+++ b/.github/workflows/e2e-upgrade.yml
@@ -157,7 +157,7 @@ jobs:
       - name: Upload CLI binary
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
-          name: cli
+          name: constellation
           path: build/constellation
 
   create-cluster:
@@ -216,6 +216,13 @@ jobs:
           awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }}
           selfManagedInfra: "false"
 
+      - name: Upload working directory
+        if: always()
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        with:
+          name: workdir
+          path: .
+
   e2e-upgrade:
     name: Run upgrade test
     runs-on: ubuntu-22.04
@@ -292,7 +299,7 @@ jobs:
       - name: Download CLI
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
-          name: cli
+          name: constellation
           path: build
 
       - name: Migrate config
@@ -347,6 +354,24 @@ jobs:
 
           bazel run //e2e/internal/upgrade:upgrade_test -- --want-worker "$WORKERNODES" --want-control "$CONTROLNODES" --target-image "$IMAGE" "$KUBERNETES_FLAG" "$MICROSERVICES_FLAG"
 
+      - name: Upload working directory
+        if: always()
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        with:
+          name: workdir
+          path: .
+
+  clean-up:
+    name: Clean up resources
+    runs-on: ubuntu-22.04
+    permissions:
+      id-token: write
+      checks: write
+      contents: read
+      packages: write
+    needs:
+      - create-cluster
+    steps:
       - name: Always fetch logs
         if: always()
         env:
@@ -386,7 +411,7 @@ jobs:
 
       - name: Notify about failure
         if: |
-          failure() &&
+          always() &&
           github.ref == 'refs/heads/main' &&
           inputs.scheduled
         continue-on-error: true