diff --git a/Cargo.lock b/Cargo.lock
index 6eaedc5..c08e353 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3939,7 +3939,7 @@ dependencies = [
 
 [[package]]
 name = "orbien-client"
-version = "3.6.0-beta.1"
+version = "3.6.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3960,7 +3960,7 @@ dependencies = [
 
 [[package]]
 name = "orbien-core"
-version = "3.6.0-beta.1"
+version = "3.6.0"
 dependencies = [
  "anyhow",
  "base64",
@@ -3991,7 +3991,7 @@ dependencies = [
 
 [[package]]
 name = "orbien-desktop"
-version = "3.6.0-beta.1"
+version = "3.6.0"
 dependencies = [
  "anyhow",
  "libc",
@@ -4012,7 +4012,7 @@ dependencies = [
 
 [[package]]
 name = "orbien-server"
-version = "3.6.0-beta.1"
+version = "3.6.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/Cargo.toml b/Cargo.toml
index 27d42fd..e4a3843 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 ]
 
 [workspace.package]
-version = "3.6.0-beta.1"
+version = "3.6.0"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["orbien"]
diff --git a/README.md b/README.md
index 4175e43..11d6544 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
     <img src="https://img.shields.io/badge/Rust-Tokio-orange?style=for-the-badge&logo=rust&logoColor=white" alt="Rust"/>
   </a>
   <a href="https://github.com/orbien-org/orbien/releases">
-    <img src="https://img.shields.io/badge/orbien-3.6.0--beta.1-blue?style=for-the-badge" alt="orbien:3.6.0-beta.1"/>
+    <img src="https://img.shields.io/badge/orbien-3.6.0-blue?style=for-the-badge" alt="orbien:3.6.0"/>
   </a>
   <a href="https://somsubhra.github.io/github-release-stats/?username=orbien-org&repository=orbien">
     <img src="https://img.shields.io/github/downloads/orbien-org/orbien/total?style=for-the-badge" alt="Downloads"/>
diff --git a/README_ZH.md b/README_ZH.md
index 395b769..ced2f38 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -21,7 +21,7 @@
     <img src="https://img.shields.io/badge/Rust-Tokio-orange?style=for-the-badge&logo=rust&logoColor=white" alt="Rust"/>
   </a>
   <a href="https://github.com/orbien-org/orbien/releases">
-    <img src="https://img.shields.io/badge/orbien-3.6.0--beta.1-blue?style=for-the-badge" alt="orbien:3.6.0-beta.1"/>
+    <img src="https://img.shields.io/badge/orbien-3.6.0-blue?style=for-the-badge" alt="orbien:3.6.0"/>
   </a>
   <a href="https://somsubhra.github.io/github-release-stats/?username=orbien-org&repository=orbien">
     <img src="https://img.shields.io/github/downloads/orbien-org/orbien/total?style=for-the-badge" alt="Downloads"/>
diff --git a/client-java/orbien-client/pom.xml b/client-java/orbien-client/pom.xml
index be16093..18295b8 100644
--- a/client-java/orbien-client/pom.xml
+++ b/client-java/orbien-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.github.lxien</groupId>
     <artifactId>orbien</artifactId>
-    <version>3.6.0-beta.1</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>orbien-client</artifactId>
diff --git a/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClient.java b/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClient.java
index 550e539..6a01a74 100644
--- a/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClient.java
+++ b/client-java/orbien-client/src/main/java/io/github/lxien/orbien/client/OrbienClient.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 
 public final class OrbienClient implements AutoCloseable {
     private static final Logger log = LoggerFactory.getLogger(OrbienClient.class);
-    private static final String VERSION = "3.6.0-beta.1";
+    private static final String VERSION = "3.6.0";
 
     private final OrbienClientConfig config;
     private final AtomicBoolean started = new AtomicBoolean(false);
diff --git a/client-java/orbien-spring-boot-demo/pom.xml b/client-java/orbien-spring-boot-demo/pom.xml
index e9b31a6..37ea524 100644
--- a/client-java/orbien-spring-boot-demo/pom.xml
+++ b/client-java/orbien-spring-boot-demo/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.github.lxien</groupId>
     <artifactId>orbien</artifactId>
-    <version>3.6.0-beta.1</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>orbien-spring-boot-demo</artifactId>
diff --git a/client-java/orbien-spring-boot-starter/pom.xml b/client-java/orbien-spring-boot-starter/pom.xml
index 177829b..82fdd4a 100644
--- a/client-java/orbien-spring-boot-starter/pom.xml
+++ b/client-java/orbien-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.github.lxien</groupId>
     <artifactId>orbien</artifactId>
-    <version>3.6.0-beta.1</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>orbien-spring-boot-starter</artifactId>
diff --git a/client-java/pom.xml b/client-java/pom.xml
index b464879..1b39fd2 100644
--- a/client-java/pom.xml
+++ b/client-java/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.github.lxien</groupId>
   <artifactId>orbien</artifactId>
-  <version>3.6.0-beta.1</version>
+  <version>3.6.0</version>
   <packaging>pom</packaging>
 
   <name>orbien</name>
diff --git a/docs/docs/integrations/springboot.mdx b/docs/docs/integrations/springboot.mdx
index 5e2434a..2530a2f 100644
--- a/docs/docs/integrations/springboot.mdx
+++ b/docs/docs/integrations/springboot.mdx
@@ -19,13 +19,13 @@ import TabItem from '@theme/TabItem';
         <dependency>
             <groupId>io.github.lxien</groupId>
             <artifactId>orbien-spring-boot-starter</artifactId>
-            <version>3.6.0-beta.1</version>
+            <version>3.6.0</version>
         </dependency>
         ```
     </TabItem>
     <TabItem value="Gradle" label="Gradle">
         ```groovy
-        implementation("io.github.lxien:orbien-spring-boot-starter:3.6.0-beta.1")
+        implementation("io.github.lxien:orbien-spring-boot-starter:3.6.0")
         ```
     </TabItem>
 </Tabs>
diff --git a/docs/i18n/en/docusaurus-plugin-content-docs/current/integrations/springboot.mdx b/docs/i18n/en/docusaurus-plugin-content-docs/current/integrations/springboot.mdx
index 25e3f2c..6c407db 100644
--- a/docs/i18n/en/docusaurus-plugin-content-docs/current/integrations/springboot.mdx
+++ b/docs/i18n/en/docusaurus-plugin-content-docs/current/integrations/springboot.mdx
@@ -19,13 +19,13 @@ import TabItem from '@theme/TabItem';
         <dependency>
             <groupId>io.github.lxien</groupId>
             <artifactId>orbien-spring-boot-starter</artifactId>
-            <version>3.6.0-beta.1</version>
+            <version>3.6.0</version>
         </dependency>
         ```
     </TabItem>
     <TabItem value="Gradle" label="Gradle">
         ```groovy
-        implementation("io.github.lxien:orbien-spring-boot-starter:3.6.0-beta.1")
+        implementation("io.github.lxien:orbien-spring-boot-starter:3.6.0")
         ```
     </TabItem>
 </Tabs>
diff --git a/docs/package.json b/docs/package.json
index 9c12bb4..aa73379 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orbien-docs",
-  "version": "3.6.0-beta.1",
+  "version": "3.6.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
diff --git a/docs/src/components/DownloadMatrix/index.tsx b/docs/src/components/DownloadMatrix/index.tsx
index 8ebf05d..4024a4f 100644
--- a/docs/src/components/DownloadMatrix/index.tsx
+++ b/docs/src/components/DownloadMatrix/index.tsx
@@ -7,7 +7,7 @@ import styles from './styles.module.css';
 
 const REPO = 'orbien-org/orbien';
 
-const FALLBACK_VERSION = '3.6.0-beta.1';
+const FALLBACK_VERSION = '3.6.0';
 
 type OsId = 'windows' | 'linux' | 'darwin' | 'freebsd';
 type ArchId = 'amd64' | 'arm64';
diff --git a/server-ui/package-lock.json b/server-ui/package-lock.json
index 3343c67..dea94e9 100644
--- a/server-ui/package-lock.json
+++ b/server-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "orbien-server-ui",
-  "version": "3.6.0-beta.1",
+  "version": "3.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "orbien-server-ui",
-      "version": "3.6.0-beta.1",
+      "version": "3.6.0",
       "dependencies": {
         "vue": "^3.5.22",
         "vue-i18n": "^11.4.8",
diff --git a/server-ui/package.json b/server-ui/package.json
index 56d8737..931ad96 100644
--- a/server-ui/package.json
+++ b/server-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "orbien-server-ui",
   "private": true,
-  "version": "3.6.0-beta.1",
+  "version": "3.6.0",
   "type": "module",
   "scripts": {
     "dev": "vite",