diff --git a/matter_server/CHANGELOG.md b/matter_server/CHANGELOG.md
index 0c690460b1..e6f60c3e44 100644
--- a/matter_server/CHANGELOG.md
+++ b/matter_server/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.8.0
+
+- Bump Python Matter Server to [3.6.1](https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.6.1)
+
 ## 4.7.0
 
 - Use the Python Matter Server container as base
diff --git a/matter_server/build.yaml b/matter_server/build.yaml
index 35e7229786..ac9273b809 100644
--- a/matter_server/build.yaml
+++ b/matter_server/build.yaml
@@ -1,7 +1,7 @@
 ---
 build_from:
-  aarch64: ghcr.io/home-assistant-libs/python-matter-server:3.5.2
-  amd64: ghcr.io/home-assistant-libs/python-matter-server:3.5.2
+  aarch64: ghcr.io/home-assistant-libs/python-matter-server:3.6.1
+  amd64: ghcr.io/home-assistant-libs/python-matter-server:3.6.1
 args:
   BASHIO_VERSION: 0.14.3
   TEMPIO_VERSION: 2021.09.0
diff --git a/matter_server/config.yaml b/matter_server/config.yaml
index 0de4932279..35d0fe320b 100644
--- a/matter_server/config.yaml
+++ b/matter_server/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 4.7.0
+version: 4.8.0
 slug: matter_server
 name: Matter Server
 description: Matter WebSocket Server for Home Assistant Matter support.