diff --git a/.github/release-manifest.json b/.github/release-manifest.json
index c2b0b7f273..9e3bd9c5d2 100644
--- a/.github/release-manifest.json
+++ b/.github/release-manifest.json
@@ -1,9 +1,9 @@
 {
-  "version": "26.3.6",
-  "release_line": "26.3",
-  "target_sha": "c81b454367441f83fc8933b5012d4e6bbae28507",
-  "cutoff_tag": "release-cutoff-2026-03",
-  "next_cutoff_tag": "release-cutoff-2026-04",
-  "previous_stable_tag": "v26.3.5",
-  "generated_at": "2026-04-30T03:02:58Z"
+  "version": "26.4.0",
+  "release_line": "26.4",
+  "target_sha": "135241c6a36585b937435722bc871ed9379b9366",
+  "cutoff_tag": "release-cutoff-2026-04",
+  "next_cutoff_tag": "release-cutoff-2026-05",
+  "previous_stable_tag": "v26.3.6",
+  "generated_at": "2026-05-31T03:04:59Z"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a79311753..61c39b278e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Convoy Changes
 
+## 26.4.0
+
+### Features
+
+- feat(controlplane): add logger lint rules (#2628)
+- feat(controlplane): add queue monitoring to admin dashboard (#2623)
+- feat(controlplane): refactor object storage (#2613)
+
+### Improvements
+
+- chore(deps): upgrade to request migration v2 (#2534)
+- refactor(dataplane): move agent runtime into internal package (#2615)
+- chore(release): cut monthly binaries from prior cutoff (#2617)
+- refactor(ci): extract inline workflow scripts into scripts/ci/ (#2618)
+- refactor(docs): update doc generation (#2626)
+- chore(ci): add nighly CVE scans (#2630)
+- chore(deps): fix CVEs from scan (#2631)
+- chore(deps): fix package.lock path (#2633)
+- chore(deps): added workflow to bump staging tag on successful merge to main (#2632)
+- chore(deps): fix workflow file for cloud image bump (#2634)
+
+### Bug Fixes
+
+- fix(dataplane): assert non-nil configurations for HmacOptions (#2619)
+- fix(controlplane): harden SSO login and retry deactivation paths (#2621)
+- fix(controlplane): prevent password reset token replay (PDE-733) (#2629)
+
+### Others
+
+- Escape special characters in AMQP connection credentials and add unit/integration tests for connection string builder (#2625)
+
 ## 26.3.6