diff --git a/CHANGELOG.md b/CHANGELOG.md
index d88e8685..b136d806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.36.0] - 2025-05-14
+
+### Added
+
+- Added `package-lock` file, bumped dev dependencies and bumped up `NODEJS` to `v20` for the `GH Actions`. PR: [bfx-facs-db-better-sqlite#12](https://github.com/bitfinexcom/bfx-facs-db-better-sqlite/pull/12)
+- Implemented user notifications about inaccurate `Tax Report` calculations due to `delisted` tokens. PR: [bfx-report-ui#926](https://github.com/bitfinexcom/bfx-report-ui/pull/926)
+- Implemented the possibility to `Deduct Fees` in the `Tax Report`. PR: [bfx-report-ui#928](https://github.com/bitfinexcom/bfx-report-ui/pull/928)
+
+### Changed
+
+- Made two loading windows for a startup without a parent window independently and for common purposes as a modal window with a parent window to prevent the main window interaction when showing the loading window for some sensitive cases such as import/export DB. PR: [bfx-report-electron#535](https://github.com/bitfinexcom/bfx-report-electron/pull/535)
+- Disabled `Loan Report` refresh button during initial synchronization to prevent report generation errors. Added a corresponding notice to communicate this to the user. PR: [bfx-report-ui#927](https://github.com/bitfinexcom/bfx-report-ui/pull/927)
+
+### Fixed
+
+- Fixed the sync requested by the user via the UI button in case the sync was added by the scheduler and the app was closed before completing earlier. PR: [bfx-reports-framework#454](https://github.com/bitfinexcom/bfx-reports-framework/pull/454)
+
 ## [4.35.0] - 2025-04-23
 
 ### Added
diff --git a/bfx-report-ui b/bfx-report-ui
index 67f2bb34..4c63f6a8 160000
--- a/bfx-report-ui
+++ b/bfx-report-ui
@@ -1 +1 @@
-Subproject commit 67f2bb34189a70b236cbf0c413c48688d4652e49
+Subproject commit 4c63f6a812423e8ef302960d5929ee7b97d5da59
diff --git a/bfx-reports-framework b/bfx-reports-framework
index ef7abebc..7db14630 160000
--- a/bfx-reports-framework
+++ b/bfx-reports-framework
@@ -1 +1 @@
-Subproject commit ef7abebc09341df199c0323eddb2db73625858a8
+Subproject commit 7db146304d2d62d3eb67a9f20d5e3420b7f5025b
diff --git a/package-lock.json b/package-lock.json
index a3807237..f03fae41 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.35.0",
+  "version": "4.36.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bfx-report-electron",
-      "version": "4.35.0",
+      "version": "4.36.0",
       "license": "Apache-2.0",
       "dependencies": {
         "archiver": "7.0.1",
diff --git a/package.json b/package.json
index 46c4db9c..f6c9037c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-electron",
-  "version": "4.35.0",
+  "version": "4.36.0",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",