diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee6301676..a0475584e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to the "vscode-gradle" extension will be documented in this
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 3.16.0
+## What's Changed
+* performance - Merge Task Server & Build Server by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1512
+* performance - Merge Language Server to Gradle Server by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1525
+* fix - Catch the error when running Gradle tests by @jdneo in https://github.com/microsoft/vscode-gradle/pull/1524
+* fix - Wrong status code returned for test completion by @jdneo in https://github.com/microsoft/vscode-gradle/pull/1532
+* fix - Override LanguageServer setTrace to avoid default Exception throw by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1533
+* fix - Get daemon status handle project folder name include empty space by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1537
+* documentation - Update architecture.md for merge server by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1520
+* documentation - Update doc after merge language server by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1528
+
 ### 3.15.0
 ## What's Changed
 * feat - Support delegate tests to Gradle build Server by @jdneo in https://github.com/microsoft/vscode-gradle/pull/1510
diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml b/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml
index b88b0193a..cdb162243 100644
--- a/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml
+++ b/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.microsoft.gradle.jdtls.ext</groupId>
 		<artifactId>gradle-jdtls-ext-parent</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0</version>
 	</parent>
 	<artifactId>com.microsoft.gradle.bs.importer.tp</artifactId>
 	<name>${base.name} :: Target Platform</name>
diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF b/extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF
index b1f3cd528..fe293d6fe 100644
--- a/extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF
+++ b/extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gradle Build Server Importer
 Bundle-SymbolicName: com.microsoft.gradle.bs.importer;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.5.0
 Bundle-Activator: com.microsoft.gradle.bs.importer.ImporterPlugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml b/extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml
index 25de8628f..4f22eda46 100644
--- a/extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml
+++ b/extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.gradle.jdtls.ext</groupId>
         <artifactId>gradle-jdtls-ext-parent</artifactId>
-        <version>0.4.0</version>
+        <version>0.5.0</version>
     </parent>
     <artifactId>com.microsoft.gradle.bs.importer</artifactId>
     <packaging>eclipse-plugin</packaging>
diff --git a/extension/jdtls.ext/pom.xml b/extension/jdtls.ext/pom.xml
index bb85e32f3..8dd5eb1db 100644
--- a/extension/jdtls.ext/pom.xml
+++ b/extension/jdtls.ext/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.microsoft.gradle.jdtls.ext</groupId>
     <artifactId>gradle-jdtls-ext-parent</artifactId>
     <name>${base.name} :: Parent</name>
-    <version>0.4.0</version>
+    <version>0.5.0</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Gradle Build Server Client</base.name>
diff --git a/extension/package-lock.json b/extension/package-lock.json
index ecb4617e1..a4a6808a9 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "vscode-gradle",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vscode-gradle",
-      "version": "3.15.0",
+      "version": "3.16.0",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "await-lock": "^2.2.2",
diff --git a/extension/package.json b/extension/package.json
index 91c5abc12..dd75db80c 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-gradle",
   "displayName": "Gradle for Java",
   "description": "Manage Gradle Projects, run Gradle tasks and provide better Gradle file authoring experience in VS Code",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "private": true,
   "publisher": "vscjava",
   "aiKey": "b4aae7d0-c65b-4819-92bf-1d2f537ae7ce",
@@ -43,7 +43,7 @@
   "main": "./dist/index.js",
   "contributes": {
     "javaExtensions": [
-      "./server/com.microsoft.gradle.bs.importer-0.4.0.jar"
+      "./server/com.microsoft.gradle.bs.importer-0.5.0.jar"
     ],
     "languages": [
       {