diff --git a/.woodpecker/binaries.yaml b/.woodpecker/binaries.yaml
index 1de1c2109d..6098ee8b25 100644
--- a/.woodpecker/binaries.yaml
+++ b/.woodpecker/binaries.yaml
@@ -7,7 +7,7 @@ when:
       - .woodpecker/binaries.yaml
 
 variables:
-  - &golang_image 'docker.io/golang:1.23'
+  - &golang_image 'docker.io/golang:1.24'
   - &node_image 'docker.io/node:23-alpine'
   - &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x'
 
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 09b31170c3..78e13f614a 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -1,5 +1,5 @@
 variables:
-  - &golang_image 'docker.io/golang:1.23'
+  - &golang_image 'docker.io/golang:1.24'
   - &node_image 'docker.io/node:23-alpine'
   - &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x'
   - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:5.2.1'
diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml
index 3db3fcb41e..19b1e19d2a 100644
--- a/.woodpecker/docs.yaml
+++ b/.woodpecker/docs.yaml
@@ -1,5 +1,5 @@
 variables:
-  - &golang_image 'docker.io/golang:1.23'
+  - &golang_image 'docker.io/golang:1.24'
   - &node_image 'docker.io/node:23-alpine'
   - &alpine_image 'docker.io/alpine:3.21'
   - path: &when_path
diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml
index c5878dc8ac..c9e8e92eb8 100644
--- a/.woodpecker/test.yaml
+++ b/.woodpecker/test.yaml
@@ -1,5 +1,5 @@
 variables:
-  - &golang_image 'docker.io/golang:1.23'
+  - &golang_image 'docker.io/golang:1.24'
   - &when
     - path: &when_path # related config files
         - '.woodpecker/test.yaml'
diff --git a/docker/Dockerfile.agent.alpine.multiarch b/docker/Dockerfile.agent.alpine.multiarch
index 68a2c36ce0..dc3eba7c07 100644
--- a/docker/Dockerfile.agent.alpine.multiarch
+++ b/docker/Dockerfile.agent.alpine.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
 
 WORKDIR /src
 COPY . .
diff --git a/docker/Dockerfile.agent.multiarch b/docker/Dockerfile.agent.multiarch
index 91e208124b..d7c4b24c70 100644
--- a/docker/Dockerfile.agent.multiarch
+++ b/docker/Dockerfile.agent.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
 
 RUN groupadd -g 1000 woodpecker && \
   useradd -u 1000 -g 1000 woodpecker && \
diff --git a/docker/Dockerfile.cli.alpine.multiarch.rootless b/docker/Dockerfile.cli.alpine.multiarch.rootless
index c9e5a90a4c..24df4a9e08 100644
--- a/docker/Dockerfile.cli.alpine.multiarch.rootless
+++ b/docker/Dockerfile.cli.alpine.multiarch.rootless
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
 
 WORKDIR /src
 COPY . .
diff --git a/docker/Dockerfile.cli.multiarch.rootless b/docker/Dockerfile.cli.multiarch.rootless
index 0a57a315c5..0c81c5512f 100644
--- a/docker/Dockerfile.cli.multiarch.rootless
+++ b/docker/Dockerfile.cli.multiarch.rootless
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
 
 RUN groupadd -g 1000 woodpecker && \
   useradd -u 1000 -g 1000 woodpecker
diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make
index 44718613a8..e4f280edc5 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 docker.io/golang:1.23-alpine AS golang_image
+FROM docker.io/golang:1.24-alpine AS golang_image
 FROM docker.io/node:23-alpine
 
 RUN apk add --no-cache --update make gcc binutils-gold musl-dev protoc && \
diff --git a/docker/Dockerfile.server.multiarch.rootless b/docker/Dockerfile.server.multiarch.rootless
index 7bf4b5cde0..1306fe43cd 100644
--- a/docker/Dockerfile.server.multiarch.rootless
+++ b/docker/Dockerfile.server.multiarch.rootless
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
 
 RUN groupadd -g 1000 woodpecker && \
   useradd -u 1000 -g 1000 woodpecker && \