diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
deleted file mode 100644
index a414f7611..000000000
--- a/.github/workflows/govulncheck.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: govulncheck
-
-on:
-  push:
-    branches: [main, master]
-  pull_request:
-    branches: '**'
-  merge_group:
-    types: [checks_requested]
-
-
-jobs:
-  govulncheck:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    name: govulncheck
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - id: govulncheck
-        uses: golang/govulncheck-action@v1
-        with:
-           go-version-file: './go.mod'
-           check-latest: true
-           go-package: ./...
-
-  # This job is here as a github status check -- it allows us to move
-  # the merge dependency from being on all the jobs to this single
-  # one.
-  govulncheck_mergeable:
-    runs-on: ubuntu-latest
-    steps:
-      - run: true
-    needs:
-      - govulncheck
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/lint.yml
similarity index 71%
rename from .github/workflows/golangci-lint.yml
rename to .github/workflows/lint.yml
index edf57d0e3..d77659db4 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-name: golangci-lint
+name: lint
 
 on:
   push:
@@ -37,6 +37,22 @@ jobs:
       - name: golangci-lint
         if: ${{ always() }}
         run: golangci-lint run
+  govulncheck:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+    name: govulncheck
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - id: govulncheck
+        uses: golang/govulncheck-action@v1
+        with:
+           go-version-file: './go.mod'
+           check-latest: true
+           go-package: ./...
 
   # This job is here as a github status check -- it allows us to move
   # the merge dependency from being on all the jobs to this single
@@ -47,3 +63,4 @@ jobs:
       - run: true
     needs:
       - golangci
+      - govulncheck