diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f5a6c3edf60..fb0a9e6dc9bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,8 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
-### Bugfixes
-
-- Fix an issue where changing the configuration of `loki.write` would cause a panic. (@rfratto)
 
-v0.40.0-rc.1 (2024-02-23)
+v0.40.0-rc.2 (2024-02-26)
 -------------------------
 
 ### Breaking changes
@@ -122,6 +119,8 @@ v0.40.0-rc.1 (2024-02-23)
 
 - Fix an issue where the configuration of the `http` and `remotecfg` blocks get ignored after loading a module. (@erikbaranowski)
 
+- Fix an issue where changing the configuration of `loki.write` would cause a panic. (@rfratto)
+
 ### Other changes
 
 - Removed support for Windows 2012 in line with Microsoft end of life. (@mattdurham)
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index f479d5d447ec..19e4b33a26be 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -9,7 +9,7 @@ title: Grafana Agent
 description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector
 weight: 350
 cascade:
-  AGENT_RELEASE: v0.40.0-rc.1
+  AGENT_RELEASE: v0.40.0-rc.2
   OTEL_VERSION: v0.87.0
 ---
 
diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go
index 3836247b4870..fce271e8adc3 100644
--- a/pkg/operator/defaults.go
+++ b/pkg/operator/defaults.go
@@ -2,7 +2,7 @@ package operator
 
 // Supported versions of the Grafana Agent.
 var (
-	DefaultAgentVersion   = "v0.40.0-rc.1"
+	DefaultAgentVersion   = "v0.40.0-rc.2"
 	DefaultAgentBaseImage = "grafana/agent"
 	DefaultAgentImage     = DefaultAgentBaseImage + ":" + DefaultAgentVersion
 )
diff --git a/tools/gen-versioned-files/agent-version.txt b/tools/gen-versioned-files/agent-version.txt
index c5bae0561898..da5ff08256c1 100644
--- a/tools/gen-versioned-files/agent-version.txt
+++ b/tools/gen-versioned-files/agent-version.txt
@@ -1 +1 @@
-v0.40.0-rc.1
\ No newline at end of file
+v0.40.0-rc.2
\ No newline at end of file