diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index b42546351..64f7f5cac 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -279,6 +279,16 @@ jobs:
           azureCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }}
           gcpServiceAccount: "iam-e2e@constellation-e2e.iam.gserviceaccount.com"
 
+      - name: Prepare terraform state folders
+        if: always()
+        shell: bash
+        run: |
+          mkdir to-zip
+          cp -r constellation-terraform to-zip
+          cp -r constellation-iam-terraform to-zip
+          rm to-zip/constellation-terraform/plan.zip
+          rm -rf to-zip/constellation-terraform/.terraform to-zip/constellation-iam-terraform/.terraform
+
       - name: Update tfstate
         if: always()
         uses: ./.github/actions/artifact_upload