diff --git a/server/.go-version b/server/.go-version
index ae96cc7310a..6521720b414 100644
--- a/server/.go-version
+++ b/server/.go-version
@@ -1 +1 @@
-1.24.3
+1.24.5
diff --git a/server/build/Dockerfile.buildenv b/server/build/Dockerfile.buildenv
index ec9a7ffc50f..3eaa4c86390 100644
--- a/server/build/Dockerfile.buildenv
+++ b/server/build/Dockerfile.buildenv
@@ -1,4 +1,4 @@
-FROM golang:1.24.3-bookworm@sha256:29d97266c1d341b7424e2f5085440b74654ae0b61ecdba206bc12d6264844e21
+FROM golang:1.24.5-bullseye@sha256:62ba6b19de03e891f7fa1001326bd48411f2626ff35e7ba5b9d890711ce581d9
 
 RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip xmlsec1 jq pgloader
 
diff --git a/server/go.mod b/server/go.mod
index 705ce35da51..8f698e672a3 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/server/v8
 
-go 1.24.3
+go 1.24.5
 
 require (
 	code.sajari.com/docconv/v2 v2.0.0-pre.4
diff --git a/server/public/go.mod b/server/public/go.mod
index 394d55456e2..8e9b95269ba 100644
--- a/server/public/go.mod
+++ b/server/public/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/server/public
 
-go 1.24.3
+go 1.24.5
 
 require (
 	github.com/blang/semver/v4 v4.0.0