diff --git a/btcpay-server/docker-compose.yml b/btcpay-server/docker-compose.yml
index 6edc6e06..ae7cbe78 100644
--- a/btcpay-server/docker-compose.yml
+++ b/btcpay-server/docker-compose.yml
@@ -29,7 +29,7 @@ services:
       NBXPLORER_BTCHASTXINDEX: 1
 
   web:
-    image: btcpayserver/btcpayserver:2.3.5@sha256:3d05e07c28de4765eb7e290e1830e5745b36dcee6efdcaf781c6690bd9aaafff
+    image: btcpayserver/btcpayserver:2.3.6@sha256:0ff445daffc6d3d6bb8a59cf37f0f6c0d958eafb9b62147f65de7d66d5132392
     user: "1000:1000"
     restart: on-failure
     stop_grace_period: 1m
diff --git a/btcpay-server/umbrel-app.yml b/btcpay-server/umbrel-app.yml
index 83dcad6e..941e3f80 100644
--- a/btcpay-server/umbrel-app.yml
+++ b/btcpay-server/umbrel-app.yml
@@ -2,7 +2,7 @@ manifestVersion: 1
 id: btcpay-server
 category: bitcoin
 name: BTCPay Server
-version: "2.3.5"
+version: "2.3.6"
 tagline: Accept Bitcoin payments with 0 fees & no 3rd party
 description: >-
   BTCPay Server is a payment processor that allows you to receive
@@ -34,26 +34,28 @@ path: ""
 defaultUsername: ""
 defaultPassword: ""
 releaseNotes: >-
-  This release comes with new features, bug fixes, and improvements.
+  This release comes with new features, bug fixes, improvements, and reverts a regression.
 
 
   New features:
-    - Allow BTCPay Server to start without any on-chain payment methods with BTCPAY_NODEFAULTCHAIN
-    - Add custom textbox for checkout
-    - Add CoinDCX rate provider for BTC/INR rates
-    - Add Desiboard rate provider for BTC/USD and BTC/INR rates
-    - Dashboard: Support multi-crypto wallet balance widgets
-    - Ability to update a previously downloaded language pack
+    - Wallets: Add filtering using search bar on the label filter dropdown when labels exceed more than 20
+    - API: Include a payment method in the Get invoices endpoint
+    - BTCPay Invoice Modal: Add a paymentMethodId parameter
+    - Security: Include API key permission analysis metadata
+    - A plugin can now create new permission policies
 
   Bug fixes:
-    - Fix: Images in Point of Sale Cart doesn't show on mobile
-    - Fix: Payments getting undetected on LND when the node restarted
-    - Fix: Do not show claim button in pull payments if it is archived
-    - Fix: Unable to edit roles when navigating from store level to Roles
+    - Dashboard layout issues on mobile, regression from 2.3.5
+    - Subscriber portal sessions can be created again via API
+    - Can't upgrade/downgrade a Lifetime subscription
 
   Improvements:
-    - Throttle Greenfield API calls with Basic auth
-    - Added missing translations strings for various files
+    - Update Wasabi wallet folder access instructions
+    - Security: Apply CSRF protection globally to UI controllers
+    - Update many missing translations from the language packs
+
+  Regression:
+    - Revert: Dashboard: Support multi-crypto wallet balance widgets
 
   Full release notes can be found at https://github.com/btcpayserver/btcpayserver/releases
 submitter: Umbrel