diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b40193e722..d4a554fee1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,8 +16,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: stable
+          go-version-file: "go.mod"
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
-          version: v2.1
+          version: v2.4
diff --git a/Dockerfile b/Dockerfile
index a26f19a811..0e27a936f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24.4-alpine AS build
+FROM golang:1.25.12-alpine AS build
 ARG VERSION="dev"
 
 # Set the working directory
diff --git a/go.mod b/go.mod
index 4cc7682fde..83d24d9ba5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/github/github-mcp-server
 
-go 1.23.7
+go 1.25.12
 
 require (
 	github.com/google/go-github/v72 v72.0.0