diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ba8e1146b..b9dc6d394 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,13 +25,9 @@ env:
   
   TRANCHES: 8
 
-  # If you change this value, please change it in the following files as well:
-  # /.travis.yml
-  # /Dockerfile
-  # /dev.Dockerfile
-  # /make/builder.Dockerfile
-  # /.github/workflows/release.yml
-  GO_VERSION: 1.22.6
+  # If you change this please also update GO_VERSION in Makefile (then run
+  # `make lint` to see where else it needs to be updated as well).
+  GO_VERSION: 1.22.11
 
 jobs:
   ########################
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d7e932e15..bc84b7612 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -10,12 +10,9 @@ defaults:
     shell: bash
 
 env:
-  # If you change this value, please change it in the following files as well:
-  # /Dockerfile
-  # /dev.Dockerfile
-  # /make/builder.Dockerfile
-  # /.github/workflows/main.yml
-  GO_VERSION: 1.22.6
+  # If you change this please also update GO_VERSION in Makefile (then run
+  # `make lint` to see where else it needs to be updated as well).
+  GO_VERSION: 1.22.11
 
 jobs:
   main:
diff --git a/.golangci.yml b/.golangci.yml
index 8114945c6..fb95607d2 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,7 @@
 run:
-  go: "1.22.6"
+  # If you change this please also update GO_VERSION in Makefile (then run
+  # `make lint` to see where else it needs to be updated as well).
+  go: "1.22.11"
 
   # Abort after 10 minutes.
   timeout: 10m
diff --git a/Dockerfile b/Dockerfile
index 3a6f642b1..f5faab48c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
-# If you change this value, please change it in the following files as well:
-# /dev.Dockerfile
-# /make/builder.Dockerfile
-# /.github/workflows/main.yml
-# /.github/workflows/release.yml
-FROM golang:1.22.6-alpine as builder
+# If you change this please also update GO_VERSION in Makefile (then run
+# `make lint` to see where else it needs to be updated as well).
+FROM golang:1.22.11-alpine as builder
 
 # Force Go to use the cgo based DNS resolver. This is required to ensure DNS
 # queries required to connect to linked containers succeed.
diff --git a/Makefile b/Makefile
index f5fa28238..b9cf70af4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ endif
 # GO_VERSION is the Go version used for the release build, docker files, and
 # GitHub Actions. This is the reference version for the project. All other Go
 # versions are checked against this version.
-GO_VERSION = 1.22.6
+GO_VERSION = 1.22.11
 
 GOBUILD := $(LOOPVARFIX) go build -v
 GOINSTALL := $(LOOPVARFIX) go install -v
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 945e6a5b5..33acaf06a 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,9 +1,6 @@
-# If you change this value, please change it in the following files as well:
-# /Dockerfile
-# /make/builder.Dockerfile
-# /.github/workflows/main.yml
-# /.github/workflows/release.yml
-FROM golang:1.22.6-alpine as builder
+# If you change this please also update GO_VERSION in Makefile (then run
+# `make lint` to see where else it needs to be updated as well).
+FROM golang:1.22.11-alpine as builder
 
 LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
 
diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile
index 0bb29c898..9bdd13587 100644
--- a/docker/btcd/Dockerfile
+++ b/docker/btcd/Dockerfile
@@ -1,4 +1,6 @@
-FROM golang:1.22.6-alpine as builder
+# If you change this please also update GO_VERSION in Makefile (then run
+# `make lint` to see where else it needs to be updated as well).
+FROM golang:1.22.11-alpine as builder
 
 LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
 
diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile
index 253e54f16..f3658d789 100644
--- a/lnrpc/Dockerfile
+++ b/lnrpc/Dockerfile
@@ -1,4 +1,6 @@
-FROM golang:1.22.6-bookworm
+# If you change this please also update GO_VERSION in Makefile (then run
+# `make lint` to see where else it needs to be updated as well).
+FROM golang:1.22.11-bookworm
 
 RUN apt-get update && apt-get install -y \
   git \
diff --git a/lnrpc/gen_protos_docker.sh b/lnrpc/gen_protos_docker.sh
index 1472f5c5f..78f1e5718 100755
--- a/lnrpc/gen_protos_docker.sh
+++ b/lnrpc/gen_protos_docker.sh
@@ -6,7 +6,7 @@ set -e
 DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
 # golang docker image version used in this script.
-GO_IMAGE=docker.io/library/golang:1.22.6-alpine
+GO_IMAGE=docker.io/library/golang:1.22.11-alpine
 
 PROTOBUF_VERSION=$(docker run --rm -v $DIR/../:/lnd -w /lnd $GO_IMAGE \
   go list -f '{{.Version}}' -m google.golang.org/protobuf)
diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile
index 86762006d..2f61cd6f8 100644
--- a/make/builder.Dockerfile
+++ b/make/builder.Dockerfile
@@ -1,9 +1,6 @@
-# If you change this value, please change it in the following files as well:
-# /Dockerfile
-# /dev.Dockerfile
-# /.github/workflows/main.yml
-# /.github/workflows/release.yml
-FROM golang:1.22.6-bookworm
+# If you change this please also update GO_VERSION in Makefile (then run
+# `make lint` to see where else it needs to be updated as well).
+FROM golang:1.22.11-bookworm
 
 MAINTAINER Olaoluwa Osuntokun <laolu@lightning.engineering>
 
diff --git a/tools/Dockerfile b/tools/Dockerfile
index 47a081b68..3810689ba 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.6
+FROM golang:1.22.11
 
 RUN apt-get update && apt-get install -y git
 ENV GOCACHE=/tmp/build/.cache