diff --git a/package-lock.json b/package-lock.json
index 4fd4035f62d..7c69eded9c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11966,9 +11966,9 @@
             }
         },
         "node_modules/@aws/mynah-ui": {
-            "version": "4.26.1",
-            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.26.1.tgz",
-            "integrity": "sha512-qUgQ6NVmiCSp6qF43cM6522U8QtBTBbqDv5yKS/5tl9cEQuZJSfKDq2zFUstQNZmsw0GE8p/NboTDo3mRv4sSQ==",
+            "version": "4.27.0",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.27.0.tgz",
+            "integrity": "sha512-DkwenNLU+BHUYf0ntwkGllfjM+LrQXvCTiV2Eh7zV3HA59+ba5e34zge3sf7F71XukR9ckoKHXrxc0GjvVchbA==",
             "hasInstallScript": true,
             "dependencies": {
                 "escape-html": "^1.0.3",
@@ -26744,7 +26744,7 @@
                 "@aws-sdk/s3-request-presigner": "<3.731.0",
                 "@aws-sdk/smithy-client": "<3.731.0",
                 "@aws-sdk/util-arn-parser": "<3.731.0",
-                "@aws/mynah-ui": "^4.26.1",
+                "@aws/mynah-ui": "^4.27.0",
                 "@gerhobbelt/gitignore-parser": "^0.2.0-9",
                 "@iarna/toml": "^2.2.5",
                 "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/amazonq/.changes/next-release/Feature-e5ed7aac-542d-41ee-8abe-d32db5de73ae.json b/packages/amazonq/.changes/next-release/Feature-e5ed7aac-542d-41ee-8abe-d32db5de73ae.json
new file mode 100644
index 00000000000..028feced804
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Feature-e5ed7aac-542d-41ee-8abe-d32db5de73ae.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
index 7d64a740305..82695c61f19 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -498,6 +498,7 @@
         "@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.731.0",
+        "@aws-sdk/client-apprunner": "<3.731.0",
         "@aws-sdk/client-cloudcontrol": "<3.731.0",
         "@aws-sdk/client-cloudformation": "<3.731.0",
         "@aws-sdk/client-cloudwatch-logs": "<3.731.0",
@@ -512,7 +513,6 @@
         "@aws-sdk/client-ssm": "<3.731.0",
         "@aws-sdk/client-sso": "<3.731.0",
         "@aws-sdk/client-sso-oidc": "<3.731.0",
-        "@aws-sdk/client-apprunner": "<3.731.0",
         "@aws-sdk/credential-provider-env": "<3.731.0",
         "@aws-sdk/credential-provider-process": "<3.731.0",
         "@aws-sdk/credential-provider-sso": "<3.731.0",
@@ -522,7 +522,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.26.1",
+        "@aws/mynah-ui": "^4.27.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",