diff --git a/.go-version b/.go-version
index 545fd574d35..98e863cdf81 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.15.7
+1.15.8
diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
index e25ff8224de..ffab802329b 100644
--- a/CHANGELOG-developer.next.asciidoc
+++ b/CHANGELOG-developer.next.asciidoc
@@ -100,3 +100,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
 - Add support for customized monitoring API. {pull}22605[22605]
 
 - Update Go version to 1.15.7. {pull}22495[22495]
+- Update Go version to 1.15.8. {pull}23955[23955]
diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
index e5767ab1167..98c459dc4f4 100644
--- a/auditbeat/Dockerfile
+++ b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
index 8b3983fa8da..3750939e8ce 100644
--- a/filebeat/Dockerfile
+++ b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
index 51c2b06d485..ed2c4d10918 100644
--- a/heartbeat/Dockerfile
+++ b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile
index 36af746307c..096b2ec1e79 100644
--- a/journalbeat/Dockerfile
+++ b/journalbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
index cc9829656ed..6c99894603c 100644
--- a/libbeat/Dockerfile
+++ b/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index 9ae5659e79a..a77462e6e34 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.11.0
 :doc-branch: 7.x
-:go-version: 1.15.7
+:go-version: 1.15.8
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index 884ea73e093..067bc00950c 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
index 9d104c32a7e..64d1de65fe0 100644
--- a/metricbeat/module/http/_meta/Dockerfile
+++ b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 COPY test/main.go main.go
 
diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
index 6c5abe6309a..f48ccaadd29 100644
--- a/packetbeat/Dockerfile
+++ b/packetbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
index 77daddd7a86..53950aa33b6 100644
--- a/x-pack/functionbeat/Dockerfile
+++ b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \
diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile
index 1a0c44db398..935a38c8365 100644
--- a/x-pack/libbeat/Dockerfile
+++ b/x-pack/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.7
+FROM golang:1.15.8
 
 RUN \
     apt-get update \