diff --git a/.github/workflows/build_test_ci.yml b/.github/workflows/build_test_ci.yml
index 23bf2f00d..1dbe0b38f 100644
--- a/.github/workflows/build_test_ci.yml
+++ b/.github/workflows/build_test_ci.yml
@@ -173,7 +173,6 @@ jobs:
         LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
     
     - name: Partial E2E Test
-      if: github.ref != 'refs/heads/main' 
       run: make e2etest-pr
       env:
         GITHUB_TOKEN: ${{ secrets.github_token }}
diff --git a/Makefile b/Makefile
index 9870013a0..95e78731d 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ test: generate fmt vet envtest ## Run tests.
 
 .PHONY: e2etest
 e2etest: generate local-deploy chainsaw
-	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e
+	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e --assert-timeout 600s
 
 .PHONY: e2etest-pr
 e2etest-pr: generate local-deploy chainsaw
diff --git a/e2e/default-full-cluster/04-error.yaml b/e2e/default-full-cluster/03-error.yaml
similarity index 100%
rename from e2e/default-full-cluster/04-error.yaml
rename to e2e/default-full-cluster/03-error.yaml
diff --git a/e2e/default-full-cluster/06-cleanup-cluster.yaml b/e2e/default-full-cluster/04-cleanup-cluster.yaml
similarity index 100%
rename from e2e/default-full-cluster/06-cleanup-cluster.yaml
rename to e2e/default-full-cluster/04-cleanup-cluster.yaml
diff --git a/e2e/default-full-cluster/chainsaw-test.yaml b/e2e/default-full-cluster/chainsaw-test.yaml
index c4dd9f7b4..b1e008fa9 100755
--- a/e2e/default-full-cluster/chainsaw-test.yaml
+++ b/e2e/default-full-cluster/chainsaw-test.yaml
@@ -24,7 +24,7 @@ spec:
         file: 01-create-cluster.yaml
     - assert:
         file: 02-assert.yaml
-  - name: step-03
+  - name: step-02
     try:
     - script:
         env:
@@ -47,7 +47,7 @@ spec:
           ($error): ~
           (json_parse($stdout)):
             results: 2
-  - name: step-04
+  - name: step-03
     try:
     - delete:
         ref:
@@ -55,8 +55,8 @@ spec:
           kind: Cluster
           name: ($cluster)
     - error:
-        file: 04-error.yaml
-  - name: step-05
+        file: 03-error.yaml
+  - name: step-04
     try:
     - script:
         env:
@@ -79,7 +79,7 @@ spec:
           ($error): ~
           (json_parse($stdout)):
             results: 0
-  - name: step-06
+  - name: step-05
     try:
     - apply:
-        file: 06-cleanup-cluster.yaml
+        file: 04-cleanup-cluster.yaml