diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecadb4f5dc58..85cabed6e4a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,20 +18,6 @@ Main (unreleased)
 - The default sync interval for `mimir.rules.kubernetes` has changed from `30s`
   to `5m` to reduce load on Mimir. (@56quarters)
 
-- `prometheus.exporter.postgres` has been updated to the latest upstream
-  version which changes the set of exported metrics. The following metrics were
-  removed: `pg_stat_database_session_time`, `pg_stat_database_sessions`,
-  `pg_stat_database_sessions_abandoned`, `pg_stat_database_sessions_fatal`,
-  `pg_stat_database_sessions_killed`, `pg_stat_database_idle_in_transaction_time`,
-  `pg_stat_database_checksum_failures`, `pg_stat_database_checksum_last_failure`,
-  `pg_stat_database_active_time`. The following metrics were
-  renamed: `pg_stat_bgwriter_buffers_alloc`, `pg_stat_bgwriter_buffers_backend`,
-  `pg_stat_bgwriter_buffers_backend_fsync`, `pg_stat_bgwriter_buffers_checkpoint`,
-  `pg_stat_bgwriter_buffers_clean`, `pg_stat_bgwriter_checkpoint_sync_time`,
-  `pg_stat_bgwriter_checkpoint_write_time`, `pg_stat_bgwriter_checkpoints_req`,
-  `pg_stat_bgwriter_checkpoints_timed`, `pg_stat_bgwriter_maxwritten_clean`,
-  `pg_stat_bgwriter_stats_reset` - the new names include the `_total` suffix. (@thampiotr)
-
 ### Enhancements
 
 - Add support for importing folders as single module to `import.file`. (@wildum)
@@ -66,11 +52,8 @@ Main (unreleased)
 
 - Fix an issue where JSON string array elements were not parsed correctly in `loki.source.cloudflare`. (@thampiotr)
 
-
 - Fix SSRF vulnerability in `faro.receiver` by disabling source map download. (@hainenber)
 
-- Fix an issue where the azure exporter was not correctly gathering subscription scoped metrics when only one region was configured (@kgeckhart)
-
 - Fix an issue where the default values of some component's arguments change
   whenever that argument is explicitly configured. This issue only affected a
   small subset of arguments across 15 components. (@erikbaranowski, @rfratto)
@@ -81,14 +64,9 @@ Main (unreleased)
 
 - The `import.git` config block did not work with branches or tags this now fixes that behavior. (@mattdurham)
 
-- Fixed an issue where creating a `prometheus.exporter.postgres` component with
-  multiple `data_source_names` would result in an error. (@thampiotr)
-
 - Fix an issue on Windows where uninstalling Alloy did not remove it from the
   Add/Remove programs list. (@rfratto)
 
-- Fix a bug with the logs pipeline in static mode which prevented it from shutting down cleanly.
-
 - Fix a bug where a topic was claimed by the wrong consumer type in `otelcol.receiver.kafka`. (@wildum)
 
 ### Other changes
@@ -99,6 +77,36 @@ Main (unreleased)
 
 - Resync defaults for `otelcol.exporter.otlp` and `otelcol.exporter.otlphttp` with upstream. (@hainenber)
 
+v0.40.5 (2024-04-15)
+--------------------
+
+### Breaking changes
+
+- `prometheus.exporter.postgres` has been updated to the latest upstream
+  version which changes the set of exported metrics. The following metrics were
+  removed: `pg_stat_database_session_time`, `pg_stat_database_sessions`,
+  `pg_stat_database_sessions_abandoned`, `pg_stat_database_sessions_fatal`,
+  `pg_stat_database_sessions_killed`, `pg_stat_database_idle_in_transaction_time`,
+  `pg_stat_database_checksum_failures`, `pg_stat_database_checksum_last_failure`,
+  `pg_stat_database_active_time`. The following metrics were
+  renamed: `pg_stat_bgwriter_buffers_alloc`, `pg_stat_bgwriter_buffers_backend`,
+  `pg_stat_bgwriter_buffers_backend_fsync`, `pg_stat_bgwriter_buffers_checkpoint`,
+  `pg_stat_bgwriter_buffers_clean`, `pg_stat_bgwriter_checkpoint_sync_time`,
+  `pg_stat_bgwriter_checkpoint_write_time`, `pg_stat_bgwriter_checkpoints_req`,
+  `pg_stat_bgwriter_checkpoints_timed`, `pg_stat_bgwriter_maxwritten_clean`,
+  `pg_stat_bgwriter_stats_reset` - the new names include the `_total` suffix. (@thampiotr)
+
+### Bugfixes
+
+- Fix an issue where the azure exporter was not correctly gathering subscription scoped metrics when only one region was configured (@kgeckhart)
+
+- Fixed an issue where creating a `prometheus.exporter.postgres` component with
+  multiple `data_source_names` would result in an error. (@thampiotr)
+
+- Fix a bug with the logs pipeline in static mode which prevented it from shutting down cleanly.
+
+### Other changes
+
 - Updating SNMP exporter from v0.24.1 to v0.26.0.
 
 v0.40.4 (2024-04-12)
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 53d48cc4d321..d1d17fa8e314 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.4
+  AGENT_RELEASE: v0.40.5
   OTEL_VERSION: v0.96.0
 ---
 
diff --git a/static/operator/defaults.go b/static/operator/defaults.go
index e6bd8a11243b..30ecbc4f2044 100644
--- a/static/operator/defaults.go
+++ b/static/operator/defaults.go
@@ -2,7 +2,7 @@ package operator
 
 // Supported versions of the Grafana Agent.
 var (
-	DefaultAgentVersion   = "v0.40.4"
+	DefaultAgentVersion   = "v0.40.5"
 	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 be5fccfd8b1f..6a9c7cb0af27 100644
--- a/tools/gen-versioned-files/agent-version.txt
+++ b/tools/gen-versioned-files/agent-version.txt
@@ -1 +1 @@
-v0.40.4
+v0.40.5