diff --git a/.changes/3.17.json b/.changes/3.17.json
new file mode 100644
index 0000000000..2772122d56
--- /dev/null
+++ b/.changes/3.17.json
@@ -0,0 +1,17 @@
+{
+  "date" : "2024-07-15",
+  "version" : "3.17",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q/dev: proactively show code generation iterations"
+  }, {
+    "type" : "bugfix",
+    "description" : "Don't allow Q/Core to be installed in the unsupported thin client context (#4658)"
+  }, {
+    "type" : "bugfix",
+    "description" : "AmazonQ chat `@workspace` file indexing respects user's git-ignore"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /dev command: improve user error messages"
+  } ]
+}
\ No newline at end of file
diff --git a/.changes/next-release/bugfix-8634301a-bffb-4daf-976a-6473d7e9a40a.json b/.changes/next-release/bugfix-8634301a-bffb-4daf-976a-6473d7e9a40a.json
deleted file mode 100644
index 32a742df0c..0000000000
--- a/.changes/next-release/bugfix-8634301a-bffb-4daf-976a-6473d7e9a40a.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type" : "bugfix",
-  "description" : "Don't allow Q/Core to be installed in the unsupported thin client context (#4658)"
-}
\ No newline at end of file
diff --git a/.changes/next-release/bugfix-a4485a1a-b5db-4d41-81fc-478cb32b39ec.json b/.changes/next-release/bugfix-a4485a1a-b5db-4d41-81fc-478cb32b39ec.json
deleted file mode 100644
index b9a6a50d96..0000000000
--- a/.changes/next-release/bugfix-a4485a1a-b5db-4d41-81fc-478cb32b39ec.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type": "bugfix",
-  "description": "AmazonQ chat `@workspace` file indexing respects user's git-ignore"
-}
\ No newline at end of file
diff --git a/.changes/next-release/bugfix-e5a31fce-e343-4e9d-a25e-35139d69d1d1.json b/.changes/next-release/bugfix-e5a31fce-e343-4e9d-a25e-35139d69d1d1.json
deleted file mode 100644
index eee0822849..0000000000
--- a/.changes/next-release/bugfix-e5a31fce-e343-4e9d-a25e-35139d69d1d1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type" : "bugfix",
-  "description" : "Amazon Q /dev command: improve user error messages"
-}
\ No newline at end of file
diff --git a/.changes/next-release/feature-dbb83daa-1648-4af8-be1b-8ba0af36e073.json b/.changes/next-release/feature-dbb83daa-1648-4af8-be1b-8ba0af36e073.json
deleted file mode 100644
index 8e62838b01..0000000000
--- a/.changes/next-release/feature-dbb83daa-1648-4af8-be1b-8ba0af36e073.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type" : "feature",
-  "description" : "Amazon Q/dev: proactively show code generation iterations"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d17d00e3fe..4c29369302 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# _3.17_ (2024-07-15)
+- **(Feature)** Amazon Q/dev: proactively show code generation iterations
+- **(Bug Fix)** Don't allow Q/Core to be installed in the unsupported thin client context ([#4658](https://github.com/aws/aws-toolkit-jetbrains/issues/4658))
+- **(Bug Fix)** AmazonQ chat `@workspace` file indexing respects user's git-ignore
+- **(Bug Fix)** Amazon Q /dev command: improve user error messages
+
 # _3.16_ (2024-07-10)
 - **(Feature)** Add support for [Amazon Q Chat Workspace Context](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/workspace-context.html). Customers can use `@workspace` to ask questions regarding local workspace.
 
diff --git a/gradle.properties b/gradle.properties
index 4d366ed098..9d643665d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.17-SNAPSHOT
+toolkitVersion=3.17
 
 # Publish Settings
 publishToken=