diff --git a/Changelog.md b/Changelog.md
index a5573048..dbdf2bc5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab: upgrade CE to v18.2.2
 - gitaly: upgrade to v18.2.2
 - gitlab-pages: upgrade to v18.2.2
+- golang: upgrade to v1.24.6
 - ubuntu: upgrade to noble-20250716
 
 ## 18.2.1
diff --git a/Dockerfile b/Dockerfile
index cbfcd285..bb3c1c94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.1 \
-    GOLANG_VERSION=1.24.5 \
+    GOLANG_VERSION=1.24.6 \
     GITLAB_SHELL_VERSION=14.43.0 \
     GITLAB_PAGES_VERSION=18.2.2 \
     GITALY_SERVER_VERSION=18.2.2 \
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index bf4aa1fc..9aa3e37a 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     depends_on:
       - redis
       - postgresql