diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 02c3a07c9..8dd12e3e9 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -14,5 +14,5 @@ jobs:
       - name: Build the Docker image
         run: |
           docker login --username=${{ secrets.DOCKER_HUB_USER }} --password=${{ secrets.DOCKER_HUB_PWD }}
-          docker build -t b3log/siyuan:latest -t b3log/siyuan:v2.0.17 .
+          docker build -t b3log/siyuan:latest -t b3log/siyuan:v2.0.18 .
           docker push b3log/siyuan -a
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb353ad34..04524d9fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+## v2.0.18 / 2022-06-08
+
+### 改进功能
+
+* [`定位打开的文档` 增加快捷键](https://github.com/siyuan-note/siyuan/issues/4844)
+* [文档树面板左右键优化](https://github.com/siyuan-note/siyuan/issues/4852)
+* [屏幕太长导致无法动态加载且无动态滚动条](https://github.com/siyuan-note/siyuan/issues/5018)
+* [快速连击使用模板时是在斜线的下一行出现](https://github.com/siyuan-note/siyuan/issues/5083)
+* [云端同步上传大量文件时不新增通知](https://github.com/siyuan-note/siyuan/issues/5112)
+* [菜单中划选输入框超出菜单范围会导致菜单消失](https://github.com/siyuan-note/siyuan/issues/5122)
+* [改进全局搜索多个关键字命中时高亮片段](https://github.com/siyuan-note/siyuan/issues/5124)
+* [块引搜索结果高亮片段改进](https://github.com/siyuan-note/siyuan/issues/5125)
+
+### 开发重构
+
+* [`工作空间/incremental/` 文件夹移动到 `工作空间/temp/incremental/`](https://github.com/siyuan-note/siyuan/issues/5119)
+
+### 修复缺陷
+
+* [多级标题折叠后上级块引浮窗中未折叠](https://github.com/siyuan-note/siyuan/issues/4997)
+* [移动端没有通知消息时消息清除按钮未隐藏](https://github.com/siyuan-note/siyuan/issues/5111)
+* [全局关系图不显示](https://github.com/siyuan-note/siyuan/issues/5114)
+* [大纲行级元素渲染问题](https://github.com/siyuan-note/siyuan/issues/5115)
+* [移动端点击账号刷新失效](https://github.com/siyuan-note/siyuan/issues/5118)
+* [无法导出 `.sy.zip` 和 Markdown](https://github.com/siyuan-note/siyuan/issues/5120)
+* [云端同步下载文件时断点续传失效](https://github.com/siyuan-note/siyuan/issues/5123)
+* [英文单引号无法搜索](https://github.com/siyuan-note/siyuan/issues/5126)
+* [同一文档分屏后大纲定位问题](https://github.com/siyuan-note/siyuan/issues/5127)
+
 ## v2.0.17 / 2022-06-06
 
 ### 改进功能
diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
index 497587b1d..43410cea0 100644
--- a/app/appx/AppxManifest.xml
+++ b/app/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
-              Version="2.0.17.0"/>
+              Version="2.0.18.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
diff --git a/app/package.json b/app/package.json
index 49ca6efa2..08bc1ecf7 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SiYuan",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",
diff --git a/kernel/util/working.go b/kernel/util/working.go
index 3f394e062..2b65741a0 100644
--- a/kernel/util/working.go
+++ b/kernel/util/working.go
@@ -39,7 +39,7 @@ import (
 var Mode = "prod"
 
 const (
-	Ver       = "2.0.17"
+	Ver       = "2.0.18"
 	IsInsider = false
 )