diff --git a/.changes/3.39.json b/.changes/3.39.json
new file mode 100644
index 0000000000..e09cd5fad3
--- /dev/null
+++ b/.changes/3.39.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2024-11-12",
+  "version" : "3.39",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix poor inline suggestions from Amazon Q caused by improperly formatted supplemental context"
+  } ]
+}
\ No newline at end of file
diff --git a/.changes/next-release/bugfix-4dc2263c-25fa-4d07-a6e1-69389f5ec001.json b/.changes/next-release/bugfix-4dc2263c-25fa-4d07-a6e1-69389f5ec001.json
deleted file mode 100644
index 5d6a4b7019..0000000000
--- a/.changes/next-release/bugfix-4dc2263c-25fa-4d07-a6e1-69389f5ec001.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type" : "bugfix",
-  "description" : "Fix poor inline suggestions from Amazon Q caused by improperly formatted supplemental context"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdb32d5ec5..b8cf4733a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.39_ (2024-11-12)
+- **(Bug Fix)** Fix poor inline suggestions from Amazon Q caused by improperly formatted supplemental context
+
 # _3.38_ (2024-11-07)
 - **(Bug Fix)** Improve the position that inline chat shortcut hint is shown in editor
 - **(Bug Fix)** Improve `@workspace` index start stop strategy
diff --git a/gradle.properties b/gradle.properties
index c4d10d497a..45912f77ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.39-SNAPSHOT
+toolkitVersion=3.39
 
 # Publish Settings
 publishToken=