diff --git a/api/server/go.mod b/api/server/go.mod
index a5da0c1ecec..069a474ac8a 100644
--- a/api/server/go.mod
+++ b/api/server/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/api/internal
 
-go 1.26.3
+go 1.26.4
 
 require (
 	github.com/pb33f/libopenapi v0.36.4
diff --git a/server/.go-version b/server/.go-version
index f8f73814096..ea0928cedf0 100644
--- a/server/.go-version
+++ b/server/.go-version
@@ -1 +1 @@
-1.26.3
+1.26.4
diff --git a/server/build/Dockerfile.buildenv b/server/build/Dockerfile.buildenv
index 54583233d27..d19c5ff3e76 100644
--- a/server/build/Dockerfile.buildenv
+++ b/server/build/Dockerfile.buildenv
@@ -1,4 +1,4 @@
-FROM mattermost/golang-bullseye:1.26.3@sha256:3ae112b7dc291665c5582b9d768fc2adb4cdc3afbbd3fc82e03a10cd711e1a60
+FROM mattermost/golang-bullseye:1.26.4@sha256:6c979d9bf17e17dcd52fa052867f2910a4b9bca3f10d4c439e0b8f233a53d426
 ARG NODE_VERSION=20.11.1
 
 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 gnupg
diff --git a/server/build/Dockerfile.buildenv-fips b/server/build/Dockerfile.buildenv-fips
index 9a986d75132..c61a4960e0d 100644
--- a/server/build/Dockerfile.buildenv-fips
+++ b/server/build/Dockerfile.buildenv-fips
@@ -1,4 +1,4 @@
-FROM cgr.dev/mattermost.com/go-msft-fips:1.26.3-dev@sha256:48ab99fede7fb33e132a0636072971e1ec4a69520865bfa1e4b517ee9cfdef34
+FROM cgr.dev/mattermost.com/go-msft-fips:1.26.4.1-dev@sha256:e237532162e2a755fef5944d2fcaff02923752c754a5d7b60836b7a8aa682317
 ARG NODE_VERSION=20.11.1
 
 RUN apk add curl ca-certificates mailcap unrtf wv poppler-utils tzdata gpg xmlsec
diff --git a/server/go.mod b/server/go.mod
index 1d42904099d..12dfe66a4f6 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/server/v8
 
-go 1.26.3
+go 1.26.4
 
 require (
 	code.sajari.com/docconv/v2 v2.0.0-pre.4
diff --git a/server/public/go.mod b/server/public/go.mod
index a1db0e3b197..e0dd19cff45 100644
--- a/server/public/go.mod
+++ b/server/public/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/server/public
 
-go 1.26.3
+go 1.26.4
 
 require (
 	github.com/Masterminds/semver/v3 v3.5.0
diff --git a/tools/mattermost-govet/go.mod b/tools/mattermost-govet/go.mod
index 29980f9cf18..01a3f9ccfe3 100644
--- a/tools/mattermost-govet/go.mod
+++ b/tools/mattermost-govet/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/tools/mattermost-govet
 
-go 1.26.3
+go 1.26.4
 
 require (
 	github.com/pb33f/libopenapi v0.36.4
diff --git a/tools/mmgotool/go.mod b/tools/mmgotool/go.mod
index f1735f87239..6696a1d4acc 100644
--- a/tools/mmgotool/go.mod
+++ b/tools/mmgotool/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/tools/mmgotool
 
-go 1.26.3
+go 1.26.4
 
 require github.com/spf13/cobra v1.10.2
 
diff --git a/tools/sharedchannel-test/go.mod b/tools/sharedchannel-test/go.mod
index 2791befa3ae..682e657d3ce 100644
--- a/tools/sharedchannel-test/go.mod
+++ b/tools/sharedchannel-test/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost/tools/sharedchannel-test
 
-go 1.26.3
+go 1.26.4
 
 require github.com/mattermost/mattermost/server/public v0.4.0