diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 9f0544947f..adc9e848dc 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -2256,7 +2256,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
-        if: ${{ always() && steps.create-cluster.outputs.cluster-id != '' }}
+        if: ${{ always() && steps.kots-e2e.outputs.cluster-id != '' }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2321,7 +2321,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
-        if: ${{ always() && steps.create-cluster.outputs.cluster-id != '' }}
+        if: ${{ always() && steps.kots-e2e.outputs.cluster-id != '' }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2386,7 +2386,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
-        if: ${{ always() && steps.create-cluster.outputs.cluster-id != '' }}
+        if: ${{ always() && steps.kots-e2e.outputs.cluster-id != '' }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}