diff --git a/CHANGELOG.md b/CHANGELOG.md
index 392d8c68..f0a5aaa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## [Unreleased]
 
+## [3.6.0] - 2026-09-19
+
 ### Added
 - **閉じた VS Code の窓を、コンテナを再起動せずに開き直す `devbase open` を足しました（PLAN59 / #197）。**
   `devbase open [name]` / `devbase project open [name]` / `devbase container open` で、`devbase up` の
@@ -692,7 +694,8 @@ OSS 化に伴う初回リリース。devbase は本バージョンより `devbas
 ### Removed
 - 「公式レジストリ」固定の概念を廃止。各レジストリは対等な扱いとなる。
 
-[Unreleased]: https://github.com/devbasex/devbase/compare/v3.5.0...HEAD
+[Unreleased]: https://github.com/devbasex/devbase/compare/v3.6.0...HEAD
+[3.6.0]: https://github.com/devbasex/devbase/compare/v3.5.0...v3.6.0
 [3.5.0]: https://github.com/devbasex/devbase/compare/v3.4.0...v3.5.0
 [3.4.0]: https://github.com/devbasex/devbase/compare/v3.3.0...v3.4.0
 [3.3.0]: https://github.com/devbasex/devbase/compare/v3.2.2...v3.3.0
diff --git a/docs/developer/architecture.md b/docs/developer/architecture.md
index cb8b007e..e9a66846 100644
--- a/docs/developer/architecture.md
+++ b/docs/developer/architecture.md
@@ -1,6 +1,6 @@
 # devbase アーキテクチャ概要
 
-devbase v3.5.0 のアーキテクチャ設計と内部構造について説明する。
+devbase v3.6.0 のアーキテクチャ設計と内部構造について説明する。
 
 ## 全体構成
 
diff --git a/lib/devbase/__init__.py b/lib/devbase/__init__.py
index 62cbe4da..ab7260be 100644
--- a/lib/devbase/__init__.py
+++ b/lib/devbase/__init__.py
@@ -1,4 +1,4 @@
 """devbase - Docker-based Development Environment Manager"""
 
-__version__ = "3.5.0"
+__version__ = "3.6.0"
 __author__ = "devbase team"
diff --git a/lib/devbase/cli.py b/lib/devbase/cli.py
index 25d06fa8..3851a78c 100644
--- a/lib/devbase/cli.py
+++ b/lib/devbase/cli.py
@@ -15,7 +15,7 @@
 try:
     from . import __version__
 except ImportError:
-    __version__ = "3.5.0"
+    __version__ = "3.6.0"
 
 logger = get_logger("devbase.cli")
 
diff --git a/pyproject.toml b/pyproject.toml
index 4890736a..4c52a94f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "devbase"
-version = "3.5.0"
+version = "3.6.0"
 description = "Docker-based Development Environment Manager"
 requires-python = ">=3.10"
 dependencies = [
diff --git a/uv.lock b/uv.lock
index 875ea06f..6203043c 100644
--- a/uv.lock
+++ b/uv.lock
@@ -41,7 +41,7 @@ wheels = [
 
 [[package]]
 name = "devbase"
-version = "3.5.0"
+version = "3.6.0"
 source = { virtual = "." }
 dependencies = [
     { name = "boto3" },