diff --git a/.github/workflows/publish-evm.yml b/.github/workflows/publish-evm.yml
index 6052fb89c..37e53b64b 100644
--- a/.github/workflows/publish-evm.yml
+++ b/.github/workflows/publish-evm.yml
@@ -8,14 +8,19 @@ env:
 permissions:
     contents: read
 
+# on:
+#     push:
+#         branches:
+#             - "evm"
+
+
 on:
-    push:
-        branches:
-            - "evm"
+    pull_request:
+        types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:
     build:
-        if: contains(github.event.head_commit.message, 'release:') && contains(github.event.head_commit.message, 'evm')
+        # if: contains(github.event.head_commit.message, 'release:') && contains(github.event.head_commit.message, 'evm')
 
         strategy:
             fail-fast: false
@@ -78,7 +83,7 @@ jobs:
 
     publish:
         name: Publish
-        if: contains(github.event.head_commit.message, 'release:') && contains(github.event.head_commit.message, 'evm')
+        # if: contains(github.event.head_commit.message, 'release:') && contains(github.event.head_commit.message, 'evm')
         runs-on: ubuntu-latest
         needs:
             - build
@@ -132,19 +137,27 @@ jobs:
               run: ls -R ./npm
               shell: bash
 
+            # release:prepare bumps the evm version and adds the native packages as
+            # optionalDependencies, so the lockfile no longer matches package.json. Disable pnpm's
+            # implicit deps verification from here on (the initial install above keeps it) so the
+            # publish commands don't fail on the now-intentionally-out-of-sync lockfile.
             - name: Prepare release
               run: pnpm run release:prepare && pnpm install --lockfile-only
+              env:
+                  PNPM_CONFIG_VERIFY_DEPS_BEFORE_RUN: "false"
 
             - name: Publish native to NPM
               run: pnpm run release:native -- --publish-branch=evm --tag=evm --no-git-checks
               env:
                   NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+                  PNPM_CONFIG_VERIFY_DEPS_BEFORE_RUN: "false"
 
             - name: Publish to NPM
               run: |
                   pnpm run release -- --publish-branch=evm --tag=evm --no-git-checks
               env:
                   NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+                  PNPM_CONFIG_VERIFY_DEPS_BEFORE_RUN: "false"
 
             # - name: Set dist-tag latest
             #   run: |
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 5f70dcb25..8cb33c8e1 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -13,3 +13,5 @@ allowBuilds:
   nsfw: true
   nx: true
   protobufjs: true
+minimumReleaseAgeExclude:
+  - "@mainsail/*"