diff --git a/.github/workflows/mergify.yml.bak b/.github/workflows/mergify.yml.bak
deleted file mode 100644
index 2adc55518f..0000000000
--- a/.github/workflows/mergify.yml.bak
+++ /dev/null
@@ -1,65 +0,0 @@
-name: automerge
-
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-
-  pull_request_review:
-    types:
-      - submitted
-
-  repository_dispatch:
-    types: [rust-tests-successful, solidity-tests-successful]
-
-  status: {}
-
-jobs:
-  automerge:
-
-    runs-on: larger-runner
-
-    steps:
-      - name: automerge
-        if: ${{ secrets.ACTIONS_PAT }}
-        uses: pascalgn/automerge-action@v0.13.1
-        env:
-          GITHUB_TOKEN: "${{ secrets.ACTIONS_PAT }}"
-          MERGE_LABELS: "automerge"
-          MERGE_REMOVE_LABELS: "automerge"
-          MERGE_METHOD: "squash"
-
-# in rust.yml
-  complete:
-    runs-on: larger-runner
-    needs: [build, test, lint]
-
-    steps:
-      - name: Rust tests successful
-        if: success()
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.ACTIONS_PAT }}
-          repository: ${{ github.repository }}
-          event-type: rust-tests-successful
-
-# in solidity.yml
-  complete:
-    runs-on: larger-runner
-    needs: [install, lint, test]
-
-    steps:
-      - name: Solidity tests successful
-        if: success()
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.ACTIONS_PAT }}
-          repository: ${{ github.repository }}
-          event-type: solidity-tests-successful
diff --git a/.github/workflows/rust-skipped.yml b/.github/workflows/rust-skipped.yml
index bd2669ac17..b6e6c51cd7 100644
--- a/.github/workflows/rust-skipped.yml
+++ b/.github/workflows/rust-skipped.yml
@@ -2,10 +2,13 @@
 name: rust
 
 on:
+  push:
+    branches: [main]
   pull_request:
-    branches: [main, v3]
+    branches: [main]
     paths-ignore:
       - 'rust/**'
+      - .github/workflows/rust.yml
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ebb5623de5..bfda6c1aca 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,9 +1,8 @@
 name: rust
 
 on:
-  push:
-    branches: [main]
   pull_request:
+    branches: [main]
     paths:
       - 'rust/**'
       - .github/workflows/rust.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c1758dc043..b37ab05bbe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -129,7 +129,7 @@ jobs:
         run: yarn test
 
   e2e:
-    runs-on: arc-runner-set
+    runs-on: larger-runner
     needs: [yarn-build]
     steps:
       - uses: actions/setup-node@v3
diff --git a/typescript/cli/ci-test.sh b/typescript/cli/ci-test.sh
index d34b69ce50..071bc00b74 100755
--- a/typescript/cli/ci-test.sh
+++ b/typescript/cli/ci-test.sh
@@ -103,6 +103,9 @@ yarn workspace @hyperlane-xyz/cli run hyperlane send transfer \
 MESSAGE2_ID=`cat /tmp/message2 | grep "Message ID" | grep -E -o '0x[0-9a-f]+'`
 echo "Message 2 ID: $MESSAGE2_ID"
 
+echo "Pre-building validator with cargo"
+cargo build --release --bin validator
+
 ANVIL_CONNECTION_URL="http://127.0.0.1"
 cd ../../rust
 for i in "anvil1 8545 ANVIL1" "anvil2 8555 ANVIL2"
@@ -126,14 +129,16 @@ done
 
 echo "Validator running, sleeping to let it sync"
 # This needs to be long to allow time for the cargo build to finish
-sleep 120
+sleep 20
 echo "Done sleeping"
 
 echo "Validator Announcement:"
 cat /tmp/anvil1/validator/announcement.json
 
-echo "Running relayer"
+echo "Pre-building relayer with cargo"
+cargo build --release --bin relayer
 
+echo "Running relayer"
 export HYP_RELAYCHAINS=anvil1,anvil2
 export HYP_ALLOWLOCALCHECKPOINTSYNCERS=true
 export HYP_DB=/tmp/relayer
@@ -142,11 +147,10 @@ export HYP_CHAINS_ANVIL1_SIGNER_TYPE=hexKey
 export HYP_CHAINS_ANVIL1_SIGNER_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97
 export HYP_CHAINS_ANVIL2_SIGNER_TYPE=hexKey
 export HYP_CHAINS_ANVIL2_SIGNER_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97
-
 cargo run --bin relayer > /tmp/relayer/relayer-logs.txt &
 
 # This needs to be long to allow time for the cargo build to finish
-sleep 60
+sleep 20
 echo "Done running relayer, checking message delivery statuses"
 
 for i in "1 $MESSAGE1_ID" "2 $MESSAGE2_ID"