diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml
index 1d8ad144f1..d3f5ed2995 100644
--- a/.woodpecker/binaries.yml
+++ b/.woodpecker/binaries.yml
@@ -7,7 +7,7 @@ when:
   event: tag
 
 variables:
-  - &golang_image 'golang:1.20.2'
+  - &golang_image 'golang:1.21.1'
   - &node_image 'node:18-alpine'
   - &xgo_image 'techknowlogick/xgo:go-1.20.2'
   - &xgo_version 'go-1.20.2'
diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml
index ac23327cda..334c582638 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/docker.yml
@@ -10,7 +10,7 @@ depends_on:
   - web
 
 variables:
-  - &golang_image 'golang:1.20.2'
+  - &golang_image 'golang:1.21.1'
   - &node_image 'node:18-alpine'
   - &xgo_image 'techknowlogick/xgo:go-1.20.2'
   - &xgo_version 'go-1.20.2'
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index 82a2c19db2..9db9edcad7 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -14,7 +14,7 @@ when:
     event: cron
 
 variables:
-  - &golang_image 'golang:1.20.2'
+  - &golang_image 'golang:1.21.1'
   - &node_image 'node:18-alpine'
 
 steps:
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index c816c0d21b..fc4d3f4ca8 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -6,7 +6,7 @@ when:
       - release/*
 
 variables:
-  - &golang_image 'golang:1.20.2'
+  - &golang_image 'golang:1.21.1'
   - &when
     - path: &when_path
         # related config files
diff --git a/docker/Dockerfile.agent.alpine.multiarch b/docker/Dockerfile.agent.alpine.multiarch
index 494899b253..e26ecfbca5 100644
--- a/docker/Dockerfile.agent.alpine.multiarch
+++ b/docker/Dockerfile.agent.alpine.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 AS build
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
 
 WORKDIR /src
 COPY . .
diff --git a/docker/Dockerfile.agent.multiarch b/docker/Dockerfile.agent.multiarch
index baebcfb67c..51a28c5d91 100644
--- a/docker/Dockerfile.agent.multiarch
+++ b/docker/Dockerfile.agent.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 AS build
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
 
 WORKDIR /src
 COPY . .
diff --git a/docker/Dockerfile.cli.alpine.multiarch b/docker/Dockerfile.cli.alpine.multiarch
index 0a41dd67dd..9155e9a7e9 100644
--- a/docker/Dockerfile.cli.alpine.multiarch
+++ b/docker/Dockerfile.cli.alpine.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 AS build
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
 
 WORKDIR /src
 COPY . .
diff --git a/docker/Dockerfile.cli.multiarch b/docker/Dockerfile.cli.multiarch
index 9bdffb66db..bacc6fbc35 100644
--- a/docker/Dockerfile.cli.multiarch
+++ b/docker/Dockerfile.cli.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 AS build
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
 
 WORKDIR /src
 COPY . .
diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make
index f84c23651c..3511afac2e 100644
--- a/docker/Dockerfile.make
+++ b/docker/Dockerfile.make
@@ -1,5 +1,5 @@
 # docker build --rm  -f docker/Dockerfile.make -t woodpecker/make:local .
-FROM golang:1.20-alpine as golang_image
+FROM golang:1.21-alpine as golang_image
 FROM node:18-alpine
 
 RUN apk add --no-cache --update make gcc binutils-gold musl-dev && \
diff --git a/docker/Dockerfile.server.multiarch b/docker/Dockerfile.server.multiarch
index d79012861e..05d31d8e18 100644
--- a/docker/Dockerfile.server.multiarch
+++ b/docker/Dockerfile.server.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 AS certs
+FROM --platform=$BUILDPLATFORM golang:1.21 AS certs
 
 FROM scratch
 ARG TARGETOS TARGETARCH