diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa868ee9fd..a5d9f8f664 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.26.2'
+        go-version: '1.26.4'
     - name: install ./...
       run: go build ./...
       env:
diff --git a/.github/workflows/ci-kotlin.yml b/.github/workflows/ci-kotlin.yml
index d791c7e727..ed45bb0bc2 100644
--- a/.github/workflows/ci-kotlin.yml
+++ b/.github/workflows/ci-kotlin.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.26.2'
+          go-version: '1.26.4'
       - name: install ./...
         run: go install ./...
       - uses: actions/checkout@v6
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
index 9338a2304e..303ba047c1 100644
--- a/.github/workflows/ci-python.yml
+++ b/.github/workflows/ci-python.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.26.2'
+          go-version: '1.26.4'
       - name: install ./...
         run: go install ./...
       - uses: actions/checkout@v6
diff --git a/.github/workflows/ci-typescript.yml b/.github/workflows/ci-typescript.yml
index 5ce9b475e9..de10ff6c86 100644
--- a/.github/workflows/ci-typescript.yml
+++ b/.github/workflows/ci-typescript.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.26.2'
+          go-version: '1.26.4'
       - name: install ./...
         run: go install ./...
       - uses: actions/checkout@v6
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4cd48289a5..923ae30a88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.26.2'
+        go-version: '1.26.4'
     - run: go build ./...
       env:
         CGO_ENABLED: "0"
@@ -28,7 +28,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.26.2'
+        go-version: '1.26.4'
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest
diff --git a/CLAUDE.md b/CLAUDE.md
index 395c3d7531..efa9d2406e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,7 +6,7 @@ This document provides essential information for working with the sqlc codebase,
 
 ### Prerequisites
 
-- **Go 1.26.2+** - Required for building and testing
+- **Go 1.26.4+** - Required for building and testing
 - **Docker & Docker Compose** - Required for integration tests with databases (local development)
 - **Git** - For version control
 
@@ -147,7 +147,7 @@ make start             # Start database containers
 ### GitHub Actions Workflow
 
 - **File:** `.github/workflows/ci.yml`
-- **Go Version:** 1.26.2
+- **Go Version:** 1.26.4
 - **Database Setup:** Uses `sqlc-test-setup` (not Docker) to install and start PostgreSQL and MySQL directly on the runner
 - **Test Command:** `gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...`
 - **Additional Checks:** `govulncheck` for vulnerability scanning
diff --git a/Dockerfile b/Dockerfile
index c29982f144..cde85d8864 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # STEP 1: Build sqlc
-FROM golang:1.26.3 AS builder
+FROM golang:1.26.4 AS builder
 
 COPY . /workspace
 WORKDIR /workspace
diff --git a/go.mod b/go.mod
index 1ca7d93691..69002b2179 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/sqlc-dev/sqlc
 
 go 1.26.0
 
-toolchain go1.26.2
+toolchain go1.26.4
 
 require (
 	github.com/antlr4-go/antlr/v4 v4.13.1