diff --git a/package-lock.json b/package-lock.json
index 57c19d1d7a1..74fdc677be2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9989,9 +9989,10 @@
             }
         },
         "node_modules/@aws/mynah-ui": {
-            "version": "4.23.1",
+            "version": "4.25.1",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.25.1.tgz",
+            "integrity": "sha512-CdOaaFzeG/f1PbqmTTG2xcYC/tIfvYC5RXKOyXswRGbL+Eh5Sec0DwYJQirhK2fpVC6FHsIni3t1o86PiOqFZg==",
             "hasInstallScript": true,
-            "license": "Apache License 2.0",
             "dependencies": {
                 "escape-html": "^1.0.3",
                 "highlight.js": "^11.11.0",
@@ -23818,7 +23819,7 @@
                 "@aws-sdk/s3-request-presigner": "<3.696.0",
                 "@aws-sdk/smithy-client": "<3.696.0",
                 "@aws-sdk/util-arn-parser": "<3.696.0",
-                "@aws/mynah-ui": "^4.23.1",
+                "@aws/mynah-ui": "^4.25.1",
                 "@gerhobbelt/gitignore-parser": "^0.2.0-9",
                 "@iarna/toml": "^2.2.5",
                 "@smithy/fetch-http-handler": "^3.0.0",
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-2ce6a8ba-dbc9-4798-92f4-db2abb4de17b.json b/packages/amazonq/.changes/next-release/Bug Fix-2ce6a8ba-dbc9-4798-92f4-db2abb4de17b.json
new file mode 100644
index 00000000000..3cf406600f7
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-2ce6a8ba-dbc9-4798-92f4-db2abb4de17b.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-4116a3e0-6c6d-48bf-a991-3f872a68a121.json b/packages/amazonq/.changes/next-release/Bug Fix-4116a3e0-6c6d-48bf-a991-3f872a68a121.json
new file mode 100644
index 00000000000..78d0fb2249c
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-4116a3e0-6c6d-48bf-a991-3f872a68a121.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Progress indicator height is stretched"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-5bc056f9-796f-45e8-b04c-574821cb5171.json b/packages/amazonq/.changes/next-release/Bug Fix-5bc056f9-796f-45e8-b04c-574821cb5171.json
new file mode 100644
index 00000000000..3d4628e654b
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-5bc056f9-796f-45e8-b04c-574821cb5171.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Long descriptions in context list are cut off"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-b5a4a16d-16a4-40d2-985b-0d76abe475db.json b/packages/amazonq/.changes/next-release/Bug Fix-b5a4a16d-16a4-40d2-985b-0d76abe475db.json
new file mode 100644
index 00000000000..ec6baa28e1a
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-b5a4a16d-16a4-40d2-985b-0d76abe475db.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Animation timings are too long"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
index cca6d60ce03..66af9df73b4 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -496,30 +496,30 @@
     "dependencies": {
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+        "@aws-sdk/client-api-gateway": "<3.696.0",
         "@aws-sdk/client-cloudformation": "<3.696.0",
         "@aws-sdk/client-cloudwatch-logs": "<3.696.0",
+        "@aws-sdk/client-codecatalyst": "<3.696.0",
         "@aws-sdk/client-cognito-identity": "<3.696.0",
         "@aws-sdk/client-docdb": "<3.696.0",
         "@aws-sdk/client-docdb-elastic": "<3.696.0",
         "@aws-sdk/client-ec2": "<3.696.0",
         "@aws-sdk/client-iam": "<3.696.0",
-        "@aws-sdk/client-s3": "<3.696.0",
-        "@aws-sdk/client-api-gateway": "<3.696.0",
-        "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/client-lambda": "<3.696.0",
+        "@aws-sdk/client-s3": "<3.696.0",
         "@aws-sdk/client-ssm": "<3.696.0",
         "@aws-sdk/client-sso": "<3.696.0",
         "@aws-sdk/client-sso-oidc": "<3.696.0",
         "@aws-sdk/credential-provider-env": "<3.696.0",
         "@aws-sdk/credential-provider-process": "<3.696.0",
         "@aws-sdk/credential-provider-sso": "<3.696.0",
+        "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/property-provider": "<3.696.0",
         "@aws-sdk/protocol-http": "<3.696.0",
+        "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws-sdk/client-codecatalyst": "<3.696.0",
-        "@aws-sdk/s3-request-presigner": "<3.696.0",
-        "@aws/mynah-ui": "^4.23.1",
+        "@aws/mynah-ui": "^4.25.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^3.0.0",