diff --git a/debian/changelog b/debian/changelog
index cb46589cb..ae3b6ddae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+open5gs (2.3.6) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:45:37 +0900
+
+open5gs (2.3.6~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:44:14 +0900
+
+open5gs (2.3.6~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:43:17 +0900
+
+open5gs (2.3.6~hirsute) hirsute; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 16 Oct 2021 22:42:02 +0900
+
 open5gs (2.3.4) unstable; urgency=medium
 
   * Bug Fixed
diff --git a/docs/_posts/2021-10-16-release-v2.3.6.md b/docs/_posts/2021-10-16-release-v2.3.6.md
new file mode 100644
index 000000000..b96fa573b
--- /dev/null
+++ b/docs/_posts/2021-10-16-release-v2.3.6.md
@@ -0,0 +1,19 @@
+---
+title: "v2.3.6 - Bug Fixes 3"
+date: 2021-10-16 22:49:00 +0900
+categories:
+  - Release
+tags:
+  - News
+  - Release
+head_inline: "<style> ul { padding-bottom: 1em; } .blue { color: blue; }</style>"
+---
+
+#### Bug Fixes
+- [MME] Fix the GTP module crash after SGW-C restarts and Modify Bearer Request/Response ([#1205](https://github.com/open5gs/open5gs/issues/1205)) -- [cecrevier](https://github.com/cecrevier)
+- [SMF/SGW-C] Add Vendor-Id in Supported-Features AVP in Gx ([#1202](https://github.com/open5gs/open5gs/issues/1202)) -- [oktavlachs](https://github.com/oktavlachs)
+- [SMF/SGW-C] Expand Indications and Add Delay Value ([#1201](https://github.com/open5gs/open5gs/issues/1201)) -- [cbrasho](https://github.com/cbrasho)
+- [MME/AMF] Fix the NAS module crash when APN lenth is zero([#1199](https://github.com/open5gs/open5gs/discussions/1199)) -- [ipinfotelecom](https://github.com/ipinfotelecom)
+
+Download -- [v2.3.6.tar.gz](https://github.com/open5gs/open5gs/archive/v2.3.6.tar.gz)
+{: .notice--info}
diff --git a/meson.build b/meson.build
index 07edce315..1b771ae57 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 project('open5gs', 'c', 'cpp',
-    version : '2.3.4',
+    version : '2.3.6',
     license : 'AGPL-3.0-or-later',
     meson_version : '>= 0.43.0',
     default_options : [
@@ -24,7 +24,7 @@ project('open5gs', 'c', 'cpp',
     ],
 )
 
-libogslib_version = '2.3.4'
+libogslib_version = '2.3.6'
 
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))