diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80995335..c945887c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to the Nextcloud MCP Server will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://peps.python.org/pep-0440/).
 
+## v0.87.0 (2026-05-17)
+
+### Feat
+
+- **storage**: pluggable database backend via DATABASE_URL (ADR-026)
+
+### Fix
+
+- **storage**: address PR #798 round-4 review (NOSONAR syntax + pg_advisory_lock + engine dispose + nits)
+- **storage**: address PR #798 round-3 review (SonarQube + pool sizing + RETURNING test)
+- **storage**: address PR #798 review feedback (credentials, asyncpg extra, TLS, pool)
+
 ## v0.86.4 (2026-05-16)
 
 ### Fix
diff --git a/pyproject.toml b/pyproject.toml
index e3794064..a0e6c967 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "nextcloud-mcp-server"
-version = "0.86.4"
+version = "0.87.0"
 description = "Model Context Protocol (MCP) server for Nextcloud integration - enables AI assistants to interact with Nextcloud data"
 authors = [
     {name = "Chris Coutinho", email = "chris@coutinho.io"}
diff --git a/uv.lock b/uv.lock
index 23478528..2fee36ba 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2171,7 +2171,7 @@ wheels = [
 
 [[package]]
 name = "nextcloud-mcp-server"
-version = "0.86.4"
+version = "0.87.0"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },