diff --git a/package-lock.json b/package-lock.json
index 7025c981bec..2ff282707ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
                 "prettier": "^3.3.3",
                 "prettier-plugin-sh": "^0.14.0",
                 "pretty-quick": "^4.0.0",
-                "ts-node": "^10.9.1",
+                "ts-node": "^10.9.2",
                 "typescript": "^5.0.4",
                 "webpack": "^5.95.0",
                 "webpack-cli": "^5.1.4",
@@ -20222,7 +20222,7 @@
         },
         "packages/amazonq": {
             "name": "amazon-q-vscode",
-            "version": "1.40.0-SNAPSHOT",
+            "version": "1.40.0",
             "license": "Apache-2.0",
             "dependencies": {
                 "aws-core-vscode": "file:../core/"
diff --git a/packages/amazonq/.changes/1.40.0.json b/packages/amazonq/.changes/1.40.0.json
new file mode 100644
index 00000000000..ea251bdd8fe
--- /dev/null
+++ b/packages/amazonq/.changes/1.40.0.json
@@ -0,0 +1,66 @@
+{
+	"date": "2024-12-10",
+	"version": "1.40.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Improved LLM code review for file review."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "@workspace is missing from the welcome to q chat tab"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix chat syntax highlighting when using several different themes"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: progress bar persists after cancelling README creation"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Prompt user to choose a folder in chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev not adding Dockerfiles in nested folders"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved Code Fix generation for code review issues"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix the quick start buttons on the explore page to show amazon q colours on hover"
+		},
+		{
+			"type": "Feature",
+			"description": "Q feature dev: recognize .bms, .pli code files"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: show job ID in Transformation Hub"
+		},
+		{
+			"type": "Feature",
+			"description": "UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours"
+		},
+		{
+			"type": "Feature",
+			"description": "Add acknowledgement button for amazon q chat disclaimer"
+		},
+		{
+			"type": "Feature",
+			"description": "Navigate through prompt history by using the up/down arrows"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: Simplify log channel"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json b/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json
deleted file mode 100644
index c7d24855d6b..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Improved LLM code review for file review."
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json b/packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json
deleted file mode 100644
index 18b94f4225c..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "@workspace is missing from the welcome to q chat tab"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json b/packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json
deleted file mode 100644
index 02b38b02eb5..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Fix chat syntax highlighting when using several different themes"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json b/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json
deleted file mode 100644
index 85b6ac5c070..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Amazon Q /doc: progress bar persists after cancelling README creation"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json b/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json
deleted file mode 100644
index bbcdd4e40a8..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json b/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json
deleted file mode 100644
index fe0706a5bd8..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Amazon Q /doc: Prompt user to choose a folder in chat"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json b/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json
deleted file mode 100644
index cdddf910441..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Amazon Q /dev not adding Dockerfiles in nested folders"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json b/packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json
deleted file mode 100644
index b79066d4070..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Improved Code Fix generation for code review issues"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json b/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json
deleted file mode 100644
index 0200cbbad42..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "Q feature dev: recognize .bms, .pli code files"
-}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json b/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json
deleted file mode 100644
index e540866201e..00000000000
--- a/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Fix the quick start buttons on the explore page to show amazon q colours on hover"
-}
diff --git a/packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json b/packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json
deleted file mode 100644
index 7aaf8b7077f..00000000000
--- a/packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "Amazon Q Code Transformation: show job ID in Transformation Hub"
-}
diff --git a/packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json b/packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json
deleted file mode 100644
index 5e592eca298..00000000000
--- a/packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours"
-}
diff --git a/packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json b/packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json
deleted file mode 100644
index 20664e7f542..00000000000
--- a/packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "Add acknowledgement button for amazon q chat disclaimer"
-}
diff --git a/packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json b/packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json
deleted file mode 100644
index 33bc4142322..00000000000
--- a/packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "Navigate through prompt history by using the up/down arrows"
-}
diff --git a/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json b/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json
deleted file mode 100644
index c7df441d68b..00000000000
--- a/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "Amazon Q: Simplify log channel"
-}
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
index 3aed6288cc8..12580b159e3 100644
--- a/packages/amazonq/CHANGELOG.md
+++ b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.40.0 2024-12-10
+
+- **Bug Fix** Improved LLM code review for file review.
+- **Bug Fix** @workspace is missing from the welcome to q chat tab
+- **Bug Fix** Fix chat syntax highlighting when using several different themes
+- **Bug Fix** Amazon Q /doc: progress bar persists after cancelling README creation
+- **Bug Fix** Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names
+- **Bug Fix** Amazon Q /doc: Prompt user to choose a folder in chat
+- **Bug Fix** Amazon Q /dev not adding Dockerfiles in nested folders
+- **Bug Fix** Improved Code Fix generation for code review issues
+- **Bug Fix** Fix the quick start buttons on the explore page to show amazon q colours on hover
+- **Feature** Q feature dev: recognize .bms, .pli code files
+- **Feature** Amazon Q Code Transformation: show job ID in Transformation Hub
+- **Feature** UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours
+- **Feature** Add acknowledgement button for amazon q chat disclaimer
+- **Feature** Navigate through prompt history by using the up/down arrows
+- **Feature** Amazon Q: Simplify log channel
+
 ## 1.39.0 2024-12-03
 
 - **Feature** Added a getting started page for exploring amazon q agents
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
index d41b80b8d3f..49925587230 100644
--- a/packages/amazonq/package.json
+++ b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.40.0-SNAPSHOT",
+    "version": "1.40.0",
     "extensionKind": [
         "workspace"
     ],