diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 7ef5135d..cd831143 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,8 +1,3 @@
 {
-  "src/supabase": "2.20.0",
-  "src/realtime": "2.20.0",
-  "src/functions": "2.20.0",
-  "src/storage": "2.20.0",
-  "src/postgrest": "2.20.0",
-  "src/auth": "2.20.0"
+    ".": "2.20.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..86316c4c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## v.2.20.0 (and lower)
+
+For version 2.20.0 or lower, please consult `src/{package}/CHANGELOG.md` for individual packages changes. Since version 2.21.0, the changelogs for all subpackages have been unified into this single file, for their versions are unified into a single one. 
diff --git a/release-please-config.json b/release-please-config.json
index 00693c8b..6141a99f 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -1,29 +1,57 @@
 {
   "last-release-sha": "7236ed62c37fb57c3feac23b416fc6d9d153dd68",
   "packages": {
-    "src/realtime": {
+    ".": {
       "changelog-path": "CHANGELOG.md",
-      "release-type": "python"
-    },
-    "src/auth": {
-      "changelog-path": "CHANGELOG.md",
-      "release-type": "python"
-    },
-    "src/functions": {
-      "changelog-path": "CHANGELOG.md",
-      "release-type": "python"
-    },
-    "src/storage": {
-      "changelog-path": "CHANGELOG.md",
-      "release-type": "python"
-    },
-    "src/postgrest": {
-      "changelog-path": "CHANGELOG.md",
-      "release-type": "python"
-    },
-    "src/supabase": {
-      "changelog-path": "CHANGELOG.md",
-      "release-type": "python"
+      "separate-pull-requests": false,
+      "release-type": "python",
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "src/supabase/src/supabase/version.py"
+        },
+        {
+          "type": "toml",
+          "path": "src/supabase/pyproject.toml",
+          "jsonpath": "$.project.version"
+        },
+        {
+          "type": "generic",
+          "path": "src/auth/src/supabase_auth/version.py"
+        },
+        {
+          "type": "toml",
+          "path": "src/auth/pyproject.toml",
+          "jsonpath": "$.project.version"
+        },
+        {
+          "type": "generic",
+          "path": "src/functions/src/supabase_functions/version.py"
+        },
+        {
+          "type": "toml",
+          "path": "src/functions/pyproject.toml",
+          "jsonpath": "$.project.version"
+        },
+        {
+          "type": "generic",
+          "path": "src/postgrest/src/postgrest/version.py"
+        },
+        {
+          "type": "toml",
+          "path": "src/postgrest/pyproject.toml",
+          "jsonpath": "$.project.version"
+        },
+        {
+          "type": "generic",
+          "path": "src/storage/src/storage3/version.py"
+        },
+        {
+          "type": "toml",
+          "path": "src/storage/pyproject.toml",
+          "jsonpath": "$.project.version"
+        }
+      ]
     }
   }
 }
diff --git a/src/auth/pyproject.toml b/src/auth/pyproject.toml
index 1e79aee6..c0364166 100644
--- a/src/auth/pyproject.toml
+++ b/src/auth/pyproject.toml
@@ -26,6 +26,7 @@ dependencies = [
 homepage = "https://github.com/supabase/supabase-py/tree/main/src/auth"
 repository = "https://github.com/supabase/supabase-py"
 documentation = "https://github.com/supabase/supabase-py/tree/main/src/auth"
+changelog = "https://github.com/supabase/supabase-py/CHANGELOG.md"
 
 # [project.scripts]
 # gh-download = "scripts.gh-download:main"
diff --git a/src/functions/pyproject.toml b/src/functions/pyproject.toml
index 67b63151..fe6829d7 100644
--- a/src/functions/pyproject.toml
+++ b/src/functions/pyproject.toml
@@ -21,6 +21,7 @@ dependencies = [
 [project.urls]
 repository = "https://github.com/supabase/supabase-py"
 homepage = "https://github.com/supabase/supabase/tree/main/src/functions"
+changelog = "https://github.com/supabase/supabase-py/CHANGELOG.md"
 
 [dependency-groups]
 tests = [
diff --git a/src/postgrest/pyproject.toml b/src/postgrest/pyproject.toml
index 235d5e33..54b42d92 100644
--- a/src/postgrest/pyproject.toml
+++ b/src/postgrest/pyproject.toml
@@ -31,6 +31,7 @@ dependencies = [
 homepage = "https://github.com/supabase/supabase/tree/main/src/postgrest"
 repository = "https://github.com/supabase/supabase-py"
 documentation = "https://postgrest-py.rtfd.io"
+changelog = "https://github.com/supabase/supabase-py/CHANGELOG.md"
 
 [dependency-groups]
 test = [
diff --git a/src/realtime/pyproject.toml b/src/realtime/pyproject.toml
index 9b00a169..fd572079 100644
--- a/src/realtime/pyproject.toml
+++ b/src/realtime/pyproject.toml
@@ -23,6 +23,7 @@ dependencies = [
 homepage = "https://github.com/supabase/supabase/tree/main/src/realime"
 repository = "https://github.com/supabase/supabase-py"
 documentation = "https://github.com/supabase/supabase/tree/main/src/realime"
+changelog = "https://github.com/supabase/supabase-py/CHANGELOG.md"
 
 [dependency-groups]
 tests = [
diff --git a/src/storage/pyproject.toml b/src/storage/pyproject.toml
index 235bc2c4..02a447a3 100644
--- a/src/storage/pyproject.toml
+++ b/src/storage/pyproject.toml
@@ -31,6 +31,7 @@ dependencies = [
 documentation = "https://supabase.github.io/storage-py"
 homepage = "https://supabase.github.io/storage-py"
 repository = "https://github.com/supabase/supabase-py"
+changelog = "https://github.com/supabase/supabase-py/CHANGELOG.md"
 
 [dependency-groups]
 lints = [
diff --git a/src/supabase/pyproject.toml b/src/supabase/pyproject.toml
index 2ee88b2c..01d962eb 100644
--- a/src/supabase/pyproject.toml
+++ b/src/supabase/pyproject.toml
@@ -34,6 +34,7 @@ dependencies = [
 homepage = "https://github.com/supabase/supabase-py"
 repository = "https://github.com/supabase/supabase-py"
 documentation = "https://github.com/supabase/supabase-py/src/supabase"
+changelog = "https://github.com/supabase/supabase-py/CHANGELOG.md"
 
 [dependency-groups]
 dev = [