diff --git a/plugins/amazonq/mynah-ui/package-lock.json b/plugins/amazonq/mynah-ui/package-lock.json
index f87490d4db2..18f4767d9ef 100644
--- a/plugins/amazonq/mynah-ui/package-lock.json
+++ b/plugins/amazonq/mynah-ui/package-lock.json
@@ -9,6 +9,7 @@
             "version": "1.0.0",
             "license": "ISC",
             "dependencies": {
+                "@aws/mynah-ui": "^4.18.1",
                 "@aws/mynah-ui-chat": "npm:@aws/mynah-ui@4.15.9",
                 "@types/node": "^14.18.5",
                 "fs-extra": "^10.0.1",
@@ -55,6 +56,29 @@
                 "web-tree-sitter": "^0.20.7"
             }
         },
+        "node_modules/@aws/mynah-ui": {
+            "version": "4.18.1",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.18.1.tgz",
+            "integrity": "sha512-531FL5509O081eWIk0P0reQhGTm/ZaXhRu6FLNqMvAKySPtJyyxee0ieeGAR8h5CVI75learQbXJEGJC6XibAA==",
+            "hasInstallScript": true,
+            "license": "Apache License 2.0",
+            "dependencies": {
+                "escape-html": "^1.0.3",
+                "just-clone": "^6.2.0",
+                "marked": "^14.1.0",
+                "prismjs": "1.29.0",
+                "sanitize-html": "^2.12.1",
+                "unescape-html": "^1.1.0"
+            },
+            "peerDependencies": {
+                "escape-html": "^1.0.3",
+                "just-clone": "^6.2.0",
+                "marked": "^12.0.2",
+                "prismjs": "1.29.0",
+                "sanitize-html": "^2.12.1",
+                "unescape-html": "^1.1.0"
+            }
+        },
         "node_modules/@aws/mynah-ui-chat": {
             "name": "@aws/mynah-ui",
             "version": "4.15.9",
@@ -79,6 +103,18 @@
                 "unescape-html": "^1.1.0"
             }
         },
+        "node_modules/@aws/mynah-ui/node_modules/marked": {
+            "version": "14.1.4",
+            "resolved": "https://registry.npmjs.org/marked/-/marked-14.1.4.tgz",
+            "integrity": "sha512-vkVZ8ONmUdPnjCKc5uTRvmkRbx4EAi2OkTOXmfTDhZz3OFqMNBM1oTTWwTr4HY4uAEojhzPf+Fy8F1DWa3Sndg==",
+            "license": "MIT",
+            "bin": {
+                "marked": "bin/marked.js"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
         "node_modules/@cspotcode/source-map-support": {
             "version": "0.8.1",
             "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -1167,10 +1203,11 @@
             "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
         },
         "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -2313,12 +2350,13 @@
             }
         },
         "node_modules/micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "braces": "^3.0.2",
+                "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
             },
             "engines": {
diff --git a/plugins/amazonq/mynah-ui/package.json b/plugins/amazonq/mynah-ui/package.json
index 4d190b86c67..80b7bd66a55 100644
--- a/plugins/amazonq/mynah-ui/package.json
+++ b/plugins/amazonq/mynah-ui/package.json
@@ -12,19 +12,20 @@
         "lintfix": "eslint -c .eslintrc.js --fix --ext .ts ."
     },
     "dependencies": {
+        "@aws/mynah-ui": "^4.18.1",
         "@aws/mynah-ui-chat": "npm:@aws/mynah-ui@4.15.9",
         "@types/node": "^14.18.5",
         "fs-extra": "^10.0.1",
+        "sanitize-html": "^2.12.1",
         "ts-node": "^10.7.0",
         "uuid": "^8.3.2",
-        "sanitize-html": "^2.12.1",
         "web-tree-sitter": "^0.20.7"
     },
     "devDependencies": {
         "@aws/fully-qualified-names": "^2.1.1",
+        "@types/sanitize-html": "^2.8.0",
         "@typescript-eslint/eslint-plugin": "^5.38.0",
         "@typescript-eslint/parser": "^5.38.0",
-        "@types/sanitize-html": "^2.8.0",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.6.0",
         "eslint": "^8.26.0",