diff --git a/CHANGELOG.md b/CHANGELOG.md
index ece59d27dd5..f9f9df3a524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,4 @@
-## UNRELEASED
-
-FEATURES:
-
-IMPROVEMENTS:
+## 2.3.6 (May 19, 2023)
 
 BUG FIXES:
 
@@ -11,8 +7,6 @@ BUG FIXES:
 - provider/docker: Attempt using docker command for bridge ip [GH-13153]
 - provider/virtualbox: Update preferred locale values for driver [GH-13160]
 
-VAGRANT-GO:
-
 ## 2.3.5 (May 15, 2023)
 
 BUG FIXES:
diff --git a/version.txt b/version.txt
index b4ba24bc1d3..e75da3e63d6 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.3.6.dev
+2.3.6
diff --git a/website/data/version.json b/website/data/version.json
index 12c64ddb06f..f69dd50b561 100644
--- a/website/data/version.json
+++ b/website/data/version.json
@@ -1,4 +1,4 @@
 {
-  "VERSION": "2.3.5",
+  "VERSION": "2.3.6",
   "VMWARE_UTILITY_VERSION": "1.0.22"
 }