diff --git a/.go-version b/.go-version
index fcac8a42..c59a7249 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.11
\ No newline at end of file
+1.21.12
\ No newline at end of file
diff --git a/go/Makefile.common b/go/Makefile.common
index 39b2ca59..a0778089 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.11
+VERSION        := 1.21.12
 DEBIAN_VERSION ?= 9
 SUFFIX         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=
diff --git a/go/arm/Dockerfile.tmpl b/go/arm/Dockerfile.tmpl
index 9c0b30a4..96c08094 100644
--- a/go/arm/Dockerfile.tmpl
+++ b/go/arm/Dockerfile.tmpl
@@ -41,10 +41,8 @@ RUN apt install -y \
 RUN apt install -y \
         librpm-dev:arm64
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
-# See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y \
-        libsystemd-dev:arm64{{- if eq .DEBIAN_VERSION "11"}}=247.3-7+deb11u4{{- end }}
+        libsystemd-dev:arm64
 {{- end }}
 
 ARG REPOSITORY
@@ -88,10 +86,8 @@ RUN apt install -y \
 RUN apt install -y  \
         librpm-dev
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
-# See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y  \
-        libsystemd-dev{{- if eq .DEBIAN_VERSION "11"}}=247.3-7+deb11u4{{- end }}
+        libsystemd-dev
 {{- end }}
 
 # Declare TARGETARCH to make it available
diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index 798e41ac..ddf3e0a4 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.11
+ARG GOLANG_VERSION=1.21.12
 ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-arm64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241
+ARG GOLANG_DOWNLOAD_SHA256=94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e
 
 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 dec7d0b7..2a2a1f4a 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.11
+GOLANG_VERSION=1.21.12
 GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-GOLANG_DOWNLOAD_SHA256_AMD=54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0
-GOLANG_DOWNLOAD_SHA256_ARM=715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241
+GOLANG_DOWNLOAD_SHA256_AMD=121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5
+GOLANG_DOWNLOAD_SHA256_ARM=94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e
 
 GO_TAR_FILE=/tmp/golang.tar.gz
 
diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
index fcadadea..12192837 100644
--- a/go/main/Dockerfile.tmpl
+++ b/go/main/Dockerfile.tmpl
@@ -27,10 +27,8 @@ RUN apt install -y --no-install-recommends --allow-unauthenticated\
   libxml2-dev \
   libsqlite3-dev
 
-# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4 
-# See https://github.com/elastic/golang-crossbuild/pull/316
 RUN apt install -y --no-install-recommends --allow-unauthenticated\
-  libsystemd-dev{{- if eq .DEBIAN_VERSION "11" }}=247.3-7+deb11u4{{- end }}
+  libsystemd-dev
 {{- end }}
 
 {{- if or (eq .DEBIAN_VERSION "9") (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11") (eq .DEBIAN_VERSION "12")}}