diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e3d86bdd0d5..864d6b3cbb9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -220,8 +220,6 @@ jobs:
 
     # NOTE the execution environment lacks a terminal, needed for
     # some integration tests. So we use `ssh -tt` command to fake a terminal.
-    - uses: lima-vm/lima-actions/ssh@v1
-
     - name: "Run unit tests"
       run: ssh -tt lima-default sudo -i make -C /tmp/runc localunittest
 
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index bd711de6c6c..e96a072174b 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -41,9 +41,9 @@ jobs:
       - uses: golangci/golangci-lint-action@v6
         with:
           version: v1.64
-      # Extra linters, only checking new code from a pull request.
+      # Extra linters, only checking new code from a pull request to main.
       - name: lint-extra
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.base_ref == 'main'
         run: |
           golangci-lint run --config .golangci-extra.yml --new-from-rev=HEAD~1