diff --git a/common/vars.mk b/common/vars.mk
index 0f6cf922..132a0f46 100644
--- a/common/vars.mk
+++ b/common/vars.mk
@@ -16,7 +16,7 @@ export BASEDIR ?= $(CURDIR)
 
 # go base image
 export GO_IMAGE ?= golang
-export GO_VERSION ?= 1.20.3
+export GO_VERSION ?= 1.20.4
 export GO_IMAGE_VARIANT ?= bullseye
 
 # if set, ony build matching the local platform
diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile
index c0928b9e..e79f89ee 100644
--- a/pkg/compose/Dockerfile
+++ b/pkg/compose/Dockerfile
@@ -19,7 +19,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.3"
+ARG GO_VERSION="1.20.4"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"
diff --git a/pkg/compose/Makefile b/pkg/compose/Makefile
index a29a153c..bed8fe48 100644
--- a/pkg/compose/Makefile
+++ b/pkg/compose/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/compose/blob/v2/Dockerfile#L18
-export GO_VERSION = 1.20.3
+export GO_VERSION = 1.20.4
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
diff --git a/pkg/compose/docker-bake.hcl b/pkg/compose/docker-bake.hcl
index f6336ed4..13b046e9 100644
--- a/pkg/compose/docker-bake.hcl
+++ b/pkg/compose/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.3"
+  default = "1.20.4"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"
diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index 487fd6ba..6dfd245e 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -22,7 +22,7 @@ ARG MD2MAN_VERSION="v2.0.2"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.3"
+ARG GO_VERSION="1.20.4"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"
diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile
index 24d45d10..480cec16 100644
--- a/pkg/containerd/Makefile
+++ b/pkg/containerd/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/containerd/containerd/blob/main/.github/workflows/release.yml#L16
-export GO_VERSION = 1.20.3
+export GO_VERSION = 1.20.4
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
diff --git a/pkg/containerd/docker-bake.hcl b/pkg/containerd/docker-bake.hcl
index 77615442..f12365a0 100644
--- a/pkg/containerd/docker-bake.hcl
+++ b/pkg/containerd/docker-bake.hcl
@@ -43,7 +43,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.3"
+  default = "1.20.4"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"
diff --git a/pkg/credential-helpers/Dockerfile b/pkg/credential-helpers/Dockerfile
index b8f81d4c..e3263252 100644
--- a/pkg/credential-helpers/Dockerfile
+++ b/pkg/credential-helpers/Dockerfile
@@ -19,7 +19,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.18.5"
+ARG GO_VERSION="1.20.4"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"
diff --git a/pkg/credential-helpers/Makefile b/pkg/credential-helpers/Makefile
index b343ec75..8957127d 100644
--- a/pkg/credential-helpers/Makefile
+++ b/pkg/credential-helpers/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/docker-credential-helpers/blob/master/Dockerfile#L3
-export GO_VERSION = 1.18.5
+export GO_VERSION = 1.20.4
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
diff --git a/pkg/credential-helpers/docker-bake.hcl b/pkg/credential-helpers/docker-bake.hcl
index 5fa9046c..bf203062 100644
--- a/pkg/credential-helpers/docker-bake.hcl
+++ b/pkg/credential-helpers/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.18.5"
+  default = "1.20.4"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"
diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile
index b1984ca7..28d0ba74 100644
--- a/pkg/docker-cli/Dockerfile
+++ b/pkg/docker-cli/Dockerfile
@@ -22,7 +22,7 @@ ARG GOVERSIONINFO_VERSION="v1.3.0"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.3"
+ARG GO_VERSION="1.20.4"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"
diff --git a/pkg/docker-cli/Makefile b/pkg/docker-cli/Makefile
index fba76fcc..d972d286 100644
--- a/pkg/docker-cli/Makefile
+++ b/pkg/docker-cli/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/cli/blob/master/Dockerfile#L4
-export GO_VERSION = 1.20.3
+export GO_VERSION = 1.20.4
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
diff --git a/pkg/docker-cli/docker-bake.hcl b/pkg/docker-cli/docker-bake.hcl
index 49c3b94c..cc5e6e7a 100644
--- a/pkg/docker-cli/docker-bake.hcl
+++ b/pkg/docker-cli/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.3"
+  default = "1.20.4"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"
diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile
index 4cc0f70e..a2a7ed47 100644
--- a/pkg/docker-engine/Dockerfile
+++ b/pkg/docker-engine/Dockerfile
@@ -22,7 +22,7 @@ ARG GOWINRES_VERSION="v0.3.0"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.3"
+ARG GO_VERSION="1.20.4"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"
diff --git a/pkg/docker-engine/Makefile b/pkg/docker-engine/Makefile
index 130795ec..1b1eab53 100644
--- a/pkg/docker-engine/Makefile
+++ b/pkg/docker-engine/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/moby/moby/blob/master/Dockerfile#L3
-export GO_VERSION = 1.20.3
+export GO_VERSION = 1.20.4
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl
diff --git a/pkg/docker-engine/docker-bake.hcl b/pkg/docker-engine/docker-bake.hcl
index 03e04776..be4fd057 100644
--- a/pkg/docker-engine/docker-bake.hcl
+++ b/pkg/docker-engine/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.3"
+  default = "1.20.4"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"