diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128c34f..6139ffa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+### 4.36.2 - 16 Aug 2021
+- Escape user name in avatar image tag
+
 ### 4.36.1 - 22 Jul 2021
 - Bump gitbucket-gist-plugin to 4.21.0
 
diff --git a/README.md b/README.md
index 0f35094..8fe77e7 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,9 @@
 
 What's New in 4.36.x
 -------------
+### 4.36.2 - 16 Aug 2021
+- Escape user name in avatar image tag
+
 ### 4.36.1 - 22 Jul 2021
 - Bump gitbucket-gist-plugin to 4.21.0
 
diff --git a/build.sbt b/build.sbt
index ffaf42f..6d03374 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.36.1"
+val GitBucketVersion = "4.36.2"
 val ScalatraVersion = "2.8.0"
 val JettyVersion = "9.4.43.v20210629"
 val JgitVersion = "5.12.0.202106070339-r"
diff --git a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
index a8bae8c..4edc140 100644
--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -118,5 +118,6 @@
       new Version("4.35.2"),
       new Version("4.35.3"),
       new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml")),
-      new Version("4.36.1")
+      new Version("4.36.1"),
+      new Version("4.36.2")
     )