diff --git a/package-lock.json b/package-lock.json
index dfeafa4f7..15c57df9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21497,7 +21497,7 @@
     },
     "services/gateway": {
       "name": "@deploystack/gateway",
-      "version": "0.5.2",
+      "version": "0.6.0",
       "license": "SEE LICENSE IN ../../LICENSE",
       "dependencies": {
         "@fastify/cors": "^11.1.0",
diff --git a/services/gateway/CHANGELOG.md b/services/gateway/CHANGELOG.md
index ec61697ad..576b26f7b 100644
--- a/services/gateway/CHANGELOG.md
+++ b/services/gateway/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.6.0 (2025-08-17)
+
+* cicd(gateway): enhance release note extraction by including all relevant commits since the last tag ([3865b9d](https://github.com/deploystackio/deploystack/commit/3865b9d))
+* chore(all): update branch cleanup workflow to include gateway-release branch ([351ef11](https://github.com/deploystackio/deploystack/commit/351ef11))
+* chore(all): update release-it configuration for gateway service ([d1745e4](https://github.com/deploystackio/deploystack/commit/d1745e4))
+* chore(backend): release v0.29.2 ([715c35f](https://github.com/deploystackio/deploystack/commit/715c35f))
+* chore(backend): release v0.29.3 ([ae61537](https://github.com/deploystackio/deploystack/commit/ae61537))
+* chore(frontend): update button loading states and improve form submission handling ([206a356](https://github.com/deploystackio/deploystack/commit/206a356))
+* chore(gateway): specify commits path for release-it configuration ([8aed4aa](https://github.com/deploystackio/deploystack/commit/8aed4aa))
+* feat(backend): add error handling schemas for validation and internal server errors ([11c71ed](https://github.com/deploystackio/deploystack/commit/11c71ed))
+* feat(backend): enhance build process with webpack integration ([1aab8fa](https://github.com/deploystackio/deploystack/commit/1aab8fa))
+* feat(gateway): add 'deploystack refresh' command to refresh MCP server configurations ([e104b4c](https://github.com/deploystackio/deploystack/commit/e104b4c))
+* feat(gateway): add 'restart' command to gracefully restart the gateway server ([a65d849](https://github.com/deploystackio/deploystack/commit/a65d849))
+* feat(gateway): add logs streaming endpoint and centralized logging system ([44af50e](https://github.com/deploystackio/deploystack/commit/44af50e))
+* feat(gateway): update dependencies and enhance login command to auto-start gateway server ([f5d7661](https://github.com/deploystackio/deploystack/commit/f5d7661))
+
 ## <small>0.5.2 (2025-08-16)</small>
 
 * release v0.5.1 ([77ab293](https://github.com/deploystackio/deploystack/commit/77ab2933df6003a395f9712f37d4b6dc79a42712))
diff --git a/services/gateway/package.json b/services/gateway/package.json
index 8b0d46377..ec39e7901 100644
--- a/services/gateway/package.json
+++ b/services/gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deploystack/gateway",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "The local DeployStack Gateway for secure MCP server management.",
   "main": "dist/index.js",
   "bin": {
diff --git a/services/gateway/src/config/version.ts b/services/gateway/src/config/version.ts
index 2da50530d..d1a3c81df 100644
--- a/services/gateway/src/config/version.ts
+++ b/services/gateway/src/config/version.ts
@@ -18,8 +18,8 @@ export interface VersionCheckResult {
 
 // This will be replaced by the build script
 let versionData: VersionInfo = {
-  version: '0.5.1',
-  buildTime: '2025-08-16T07:56:39.441Z',
+  version: '0.6.0',
+  buildTime: '2025-08-17T07:37:04.547Z',
   source: 'release'
 };