diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d7a904..02da3c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 2025-08-27
+
+### Added
+- Adding mcp servers as custom tools for context agent
+- Expose an mcp server to use context agent's tools in other llms
+
+### Fixed
+- Tune prompt to not include tools in system prompt if they are disabled
+
 ## [2.0.0] - 2025-07-21
 
 ### Changed
diff --git a/Makefile b/Makefile
index 1e97900..f13ac69 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 APP_ID := context_agent
 APP_NAME := Nextcloud Context Agent
-APP_VERSION := 1.2.2
+APP_VERSION := 2.1.0
 JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"$(APP_NAME)\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":9081}"
 
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4836a0b..82087d1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -28,7 +28,7 @@ Positive:
 * The software for this app is open source, no trained AI model is used
 ]]>
 	</description>
-	<version>2.0.0</version>
+	<version>2.1.0</version>
 	<licence>MIT</licence>
 	<author mail="mklehr@gmx.net" homepage="https://marcelklehr.de">Marcel Klehr</author>
 	<namespace>ContextAgent</namespace>
@@ -44,7 +44,7 @@ Positive:
 		<docker-install>
 			<registry>ghcr.io</registry>
 			<image>nextcloud/context_agent</image>
-			<image-tag>1.2.2</image-tag>
+			<image-tag>2.1.0</image-tag>
 		</docker-install>
 	</external-app>
 </info>
diff --git a/test.env b/test.env
index f89fd61..5615056 100644
--- a/test.env
+++ b/test.env
@@ -6,6 +6,6 @@ APP_HOST=0.0.0.0
 APP_ID=context_agent
 APP_PORT=9081
 APP_SECRET=12345
-APP_VERSION=1.2.2
+APP_VERSION=2.1.0
 NEXTCLOUD_URL=http://localhost:8080
 COMPUTE_DEVICE=CPU