diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b40193e722..6c9f58924c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,8 +16,9 @@ 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
         with:
-          version: v2.1
+          version: v2.1.6
+          install-mode: goinstall
diff --git a/Dockerfile b/Dockerfile
index a26f19a811..f97c95c6c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24.4-alpine AS build
+FROM golang:1.26.6-alpine AS build
 ARG VERSION="dev"
 
 # Set the working directory
diff --git a/go.mod b/go.mod
index 4cc7682fde..f14bf0a098 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/github/github-mcp-server
 
-go 1.23.7
+go 1.26.6
 
 require (
 	github.com/google/go-github/v72 v72.0.0