diff --git a/.github/workflows/e2e-test-daily.yml b/.github/workflows/e2e-test-daily.yml
index 2b4e52006..732b9517e 100644
--- a/.github/workflows/e2e-test-daily.yml
+++ b/.github/workflows/e2e-test-daily.yml
@@ -134,7 +134,7 @@ jobs:
           fi
 
       - name: Delete tfstate artifact if necessary
-        if: env.DELETE_TF_STATE == 'true'
+        if: always() && env.DELETE_TF_STATE == 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         uses: ./.github/actions/artifact_delete
diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml
index b2592e457..79a921084 100644
--- a/.github/workflows/e2e-test-release.yml
+++ b/.github/workflows/e2e-test-release.yml
@@ -390,7 +390,7 @@ jobs:
           fi
 
       - name: Delete tfstate artifact if necessary
-        if: env.DELETE_TF_STATE == 'true'
+        if: always() && env.DELETE_TF_STATE == 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         uses: ./.github/actions/artifact_delete
diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml
index 888b55272..1b3533cfb 100644
--- a/.github/workflows/e2e-test-weekly.yml
+++ b/.github/workflows/e2e-test-weekly.yml
@@ -390,7 +390,7 @@ jobs:
           fi
 
       - name: Delete tfstate artifact if necessary
-        if: env.DELETE_TF_STATE == 'true'
+        if: always() && env.DELETE_TF_STATE == 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         uses: ./.github/actions/artifact_delete
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 9a0d99263..28297b00b 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -291,7 +291,7 @@ jobs:
           fi
 
       - name: Delete tfstate artifact if necessary
-        if: env.DELETE_TF_STATE == 'true'
+        if: always() && env.DELETE_TF_STATE == 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         uses: ./.github/actions/artifact_delete
diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
index 9a4c1691e..25006ac73 100644
--- a/.github/workflows/e2e-upgrade.yml
+++ b/.github/workflows/e2e-upgrade.yml
@@ -555,7 +555,7 @@ jobs:
           fi
 
       - name: Delete tfstate artifact if necessary
-        if: env.DELETE_TF_STATE == 'true'
+        if: always() && env.DELETE_TF_STATE == 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         uses: ./.github/actions/artifact_delete