diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 11e3d75ad..000000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9
-        with:
-          version: latest
-          args: ${{ github.event_name == 'pull_request' && '--new-from-rev=origin/main' || '' }}
-
-      - name: megalinter
-        uses: oxsecurity/megalinter@v9
-        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VALIDATE_ALL_CODEBASE: false
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index aade43fce..d39919639 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -8,20 +8,18 @@ on:
 
 jobs:
   precommit:
-    name: Pre-commit Gate
+    name: Pre-commit
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
 
       - uses: j178/prek-action@v2
 
-  lint-gate:
-    name: Lint Gate
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: setup Go
         uses: actions/setup-go@v6
@@ -32,8 +30,7 @@ jobs:
         uses: golangci/golangci-lint-action@v9
         with:
           version: latest
-          only-new-issues: false
-          args: ${{ github.event_name == 'pull_request' && '--new-from-rev=origin/main' || '' }}
+          only-new-issues: true
 
   can-read-secret:
     name: Can Read Secret
@@ -52,7 +49,7 @@ jobs:
 
   build-cli:
     name: Build CLI Binary on ${{ matrix.runner }}
-    needs: [precommit, lint-gate]
+    needs: [precommit, lint]
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
deleted file mode 100644
index 1643e9522..000000000
--- a/.github/workflows/pre-commit.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Pre-commit
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  check:
-    name: Pre-commit Checks
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: j178/prek-action@v2