diff --git a/.go-version b/.go-version
index 915ddf30..5c9a6fe7 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.7
\ No newline at end of file
+1.21.8
\ No newline at end of file
diff --git a/go/Makefile.common b/go/Makefile.common
index e150f9e6..62d63d09 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(SELF_DIR)/../Makefile.common
 
 NAME           := golang-crossbuild
-VERSION        := 1.21.7
+VERSION        := 1.21.8
 DEBIAN_VERSION ?= 9
 SUFFIX         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=
diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index f4ed0f2a..5d41caf3 100644
--- a/go/base-arm/Dockerfile.tmpl
+++ b/go/base-arm/Dockerfile.tmpl
@@ -37,9 +37,9 @@ RUN \
             libsqlite3-0 \
         && rm -rf /var/lib/apt/lists/*
 
-ARG GOLANG_VERSION=1.21.7
+ARG GOLANG_VERSION=1.21.8
 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=a9bc1ccedbfde059f25b3a2ad81ae4cdf21192ae207dfd3ccbbfe99c3749e233
+ARG GOLANG_DOWNLOAD_SHA256=3c19113c686ffa142e9159de1594c952dee64d5464965142d222eab3a81f1270
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/go/base/install-go.sh b/go/base/install-go.sh
index 38681140..276c6dcd 100644
--- a/go/base/install-go.sh
+++ b/go/base/install-go.sh
@@ -2,10 +2,10 @@
 # This script install the Go version correct for each architecture.
 set -e
 
-GOLANG_VERSION=1.21.7
+GOLANG_VERSION=1.21.8
 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-GOLANG_DOWNLOAD_SHA256_AMD=13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c
-GOLANG_DOWNLOAD_SHA256_ARM=a9bc1ccedbfde059f25b3a2ad81ae4cdf21192ae207dfd3ccbbfe99c3749e233
+GOLANG_DOWNLOAD_SHA256_AMD=538b3b143dc7f32b093c8ffe0e050c260b57fc9d57a12c4140a639a8dd2b4e4f
+GOLANG_DOWNLOAD_SHA256_ARM=3c19113c686ffa142e9159de1594c952dee64d5464965142d222eab3a81f1270
 
 GO_TAR_FILE=/tmp/golang.tar.gz