diff --git a/.github/workflows/govuln.yml b/.github/workflows/govuln.yml
deleted file mode 100644
index 775b53b656..0000000000
--- a/.github/workflows/govuln.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Govuln
-on: [ push, pull_request ]
-
-jobs:
-  govuln:
-    name: Run govuln check and Publish
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Running govulncheck
-        uses: Templum/govulncheck-action@v1.0.2
-        continue-on-error: false
-        env:
-          DEBUG: "true"
-        with:
-          go-version: 1.23
-          package: ./...
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          fail-on-vuln: true
-
-      - name: Upload govulncheck report
-        uses: actions/upload-artifact@v4.4.0
-        with:
-          name: raw-report
-          path: raw-report.json
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
new file mode 100644
index 0000000000..f72b29a699
--- /dev/null
+++ b/.github/workflows/govulncheck.yml
@@ -0,0 +1,23 @@
+name: Govuln
+on: [ push, pull_request ]
+
+jobs:
+  govulncheck:
+    name: Run govulncheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23.6"
+          check-latest: true
+      - uses: actions/checkout@v4
+      - uses: technote-space/get-diff-action@v6
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            Makefile
+      - name: govulncheck
+        run: make vulncheck
+        if: "env.GIT_DIFF != ''"
diff --git a/.github/workflows/packager_deb.yml b/.github/workflows/packager_deb.yml
index f8265dc1d9..f8efd7d4c2 100644
--- a/.github/workflows/packager_deb.yml
+++ b/.github/workflows/packager_deb.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.23.2
+          go-version: 1.23.6
      # Variables
       - name: Adding TAG to ENV
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
diff --git a/.github/workflows/rpm_arm_packager.yml b/.github/workflows/rpm_arm_packager.yml
index 79a0ded593..fed3e81739 100644
--- a/.github/workflows/rpm_arm_packager.yml
+++ b/.github/workflows/rpm_arm_packager.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.23.2
+          go-version: 1.23.6
       - name: Adding TAG to ENV
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
 
diff --git a/.github/workflows/rpm_packager.yml b/.github/workflows/rpm_packager.yml
index 06b67f0b59..1d166d080a 100644
--- a/.github/workflows/rpm_packager.yml
+++ b/.github/workflows/rpm_packager.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.23.2
+          go-version: 1.23.6
       - name: Adding TAG to ENV
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
 
diff --git a/Makefile b/Makefile
index 567c84e478..6d6a9d9936 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,12 @@ lintci-deps:
 	rm -f ./build/bin/golangci-lint
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./build/bin v1.63.4
 
+.PHONY: vulncheck
+
+vulncheck:
+	@go run golang.org/x/vuln/cmd/govulncheck@latest ./...
+
+
 goimports:
 	goimports -local "$(PACKAGE)" -w .
 
diff --git a/go.mod b/go.mod
index 6c4853295c..66ec7b776a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ethereum/go-ethereum
 
-go 1.23.2
+go 1.23.6
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2