diff --git a/src/Elastic.Documentation.Site/Assets/copybutton.ts b/src/Elastic.Documentation.Site/Assets/copybutton.ts
index cd2f05cb8..5613b23f7 100644
--- a/src/Elastic.Documentation.Site/Assets/copybutton.ts
+++ b/src/Elastic.Documentation.Site/Assets/copybutton.ts
@@ -1,5 +1,4 @@
-// Localization support
-import * as ClipboardJS from 'clipboard'
+import { $$ } from 'select-dom'
 
 const DOCUMENTATION_OPTIONS = {
     VERSION: '',
@@ -97,16 +96,7 @@ if (!iconCopy) {
 </svg>`
 }
 
-const codeCellId = (index) => `codecell${index}`
-
-// Clears selected text since ClipboardJS will select the text when copying
-const clearSelection = () => {
-    if (window.getSelection) {
-        window.getSelection().removeAllRanges()
-    } else if ('selection' in document) {
-        ;(document.selection as Selection).empty()
-    }
-}
+const codeCellId = (index: number, prefix: string) => `${prefix}${index}`
 
 // Changes tooltip text for a moment, then changes it back
 // We want the timeout of our `success` class to be a bit shorter than the
@@ -131,30 +121,45 @@ const temporarilyChangeIcon = (el) => {
     }, timeoutIcon)
 }
 
-const addCopyButtonToCodeCells = () => {
-    // If ClipboardJS hasn't loaded, wait a bit and try again. This
-    // happens because we load ClipboardJS asynchronously.
-
+const addCopyButtonToCodeCells = (
+    selector: string,
+    baseElement: ParentNode,
+    prefix: string
+) => {
     // Add copybuttons to all of our code cells
-    const COPYBUTTON_SELECTOR = '.highlight pre'
-    const codeCells = document.querySelectorAll(COPYBUTTON_SELECTOR)
+    const codeCells = $$(selector, baseElement)
     codeCells.forEach((codeCell, index) => {
         if (codeCell.id) {
             return
         }
-
-        const id = codeCellId(index)
+        const id = codeCellId(index, prefix)
         codeCell.setAttribute('id', id)
+        const clipboardButton = document.createElement('button')
+        clipboardButton.setAttribute('aria-label', 'Copy code to clipboard')
+        clipboardButton.className = 'copybtn o-tooltip--left'
+        clipboardButton.setAttribute('data-tooltip', messages[locale]['copy'])
+        clipboardButton.setAttribute('data-clipboard-target', `#${id}`)
+        clipboardButton.innerHTML = iconCopy
+        clipboardButton.onclick = async () => {
+            try {
+                const text = copyTargetText(clipboardButton, baseElement)
+                await navigator.clipboard.writeText(text)
+                temporarilyChangeTooltip(
+                    clipboardButton,
+                    messages[locale]['copy'],
+                    messages[locale]['copy_success']
+                )
+                temporarilyChangeIcon(clipboardButton)
+            } catch (error) {
+                console.error(error)
+            }
+        }
 
-        const clipboardButton = (id) =>
-            `<button aria-label="Copy code to clipboard" class="copybtn o-tooltip--left" data-tooltip="${messages[locale]['copy']}" data-clipboard-target="#${id}">
-      ${iconCopy}
-    </button>`
-        codeCell.insertAdjacentHTML('afterend', clipboardButton(id))
+        codeCell.insertAdjacentElement('afterend', clipboardButton)
     })
 
-    function escapeRegExp(string) {
-        return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
+    function escapeRegExp(str: string) {
+        return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
     }
 
     function filterText(target, excludes) {
@@ -228,8 +233,8 @@ const addCopyButtonToCodeCells = () => {
         return textContent
     }
 
-    const copyTargetText = (trigger) => {
-        const target = document.querySelector(
+    const copyTargetText = (trigger, searchElement: ParentNode = document) => {
+        const target = searchElement.querySelector(
             trigger.attributes['data-clipboard-target'].value
         )
         // get filtered text
@@ -239,30 +244,12 @@ const addCopyButtonToCodeCells = () => {
             .join('\n')
         return formatCopyText(text, '', false, true, true, true, '', '')
     }
-
-    // Initialize with a callback so we can modify the text before copy
-    const clipboard = new ClipboardJS('.copybtn', { text: copyTargetText })
-
-    // Update UI with error/success messages
-    clipboard.on('success', (event) => {
-        clearSelection()
-        temporarilyChangeTooltip(
-            event.trigger,
-            messages[locale]['copy'],
-            messages[locale]['copy_success']
-        )
-        temporarilyChangeIcon(event.trigger)
-    })
-
-    clipboard.on('error', (event) => {
-        temporarilyChangeTooltip(
-            event.trigger,
-            messages[locale]['copy'],
-            messages[locale]['copy_failure']
-        )
-    })
 }
 
-export function initCopyButton() {
-    addCopyButtonToCodeCells()
+export function initCopyButton(
+    selector: string = '.highlight pre',
+    baseElement: ParentNode = document,
+    prefix: string = 'markdown-content-codecell-'
+) {
+    addCopyButtonToCodeCells(selector, baseElement, prefix)
 }
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/AskAiSuggestions.tsx b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/AskAiSuggestions.tsx
index 27e2ed210..98796c7cc 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/AskAiSuggestions.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/AskAiSuggestions.tsx
@@ -4,6 +4,13 @@ import { EuiButton, useEuiTheme } from '@elastic/eui'
 import { css } from '@emotion/react'
 import * as React from 'react'
 
+const buttonStyles = css`
+    border: none;
+    & > span {
+        justify-content: flex-start;
+    }
+`
+
 export interface AskAiSuggestion {
     question: string
 }
@@ -16,15 +23,14 @@ export const AskAiSuggestions = (props: Props) => {
     const { submitQuestion } = useChatActions()
     const { setModalMode } = useModalActions()
     const { euiTheme } = useEuiTheme()
-    const buttonCss = css`
-        border: none;
-        & > span {
-            justify-content: flex-start;
-        }
+
+    const dynamicButtonStyles = css`
+        ${buttonStyles}
         svg {
             color: ${euiTheme.colors.textSubdued};
         }
     `
+
     return (
         <ul>
             {Array.from(props.suggestions).map((suggestion) => (
@@ -34,7 +40,7 @@ export const AskAiSuggestions = (props: Props) => {
                         color="text"
                         fullWidth
                         size="s"
-                        css={buttonCss}
+                        css={dynamicButtonStyles}
                         onClick={() => {
                             submitQuestion(suggestion.question)
                             setModalMode('askAi')
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/Chat.tsx b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/Chat.tsx
index 4e5b43400..b110742ec 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/Chat.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/Chat.tsx
@@ -17,6 +17,29 @@ import { css } from '@emotion/react'
 import * as React from 'react'
 import { useCallback, useEffect, useRef } from 'react'
 
+const containerStyles = css`
+    height: 100%;
+    max-height: 70vh;
+    overflow: hidden;
+`
+
+const scrollContainerStyles = css`
+    position: relative;
+    overflow: hidden;
+`
+
+const scrollableStyles = css`
+    height: 100%;
+    overflow-y: auto;
+    scrollbar-gutter: stable;
+    padding: 1rem;
+`
+
+const messagesStyles = css`
+    max-width: 800px;
+    margin: 0 auto;
+`
+
 // Small helper for scroll behavior
 const scrollToBottom = (container: HTMLDivElement | null) => {
     if (!container) return
@@ -44,28 +67,9 @@ export const Chat = () => {
     const scrollRef = useRef<HTMLDivElement>(null)
     const lastMessageStatusRef = useRef<string | null>(null)
 
-    const containerStyles = css`
-        height: 100%;
-        max-height: 70vh;
-        overflow: hidden;
-    `
-
-    const scrollContainerStyles = css`
-        position: relative;
-        overflow: hidden;
-    `
-
-    const scrollableStyles = css`
-        height: 100%;
-        overflow-y: auto;
-        scrollbar-gutter: stable;
+    const dynamicScrollableStyles = css`
+        ${scrollableStyles}
         ${useEuiOverflowScroll('y', true)}
-        padding: 1rem;
-    `
-
-    const messagesStyles = css`
-        max-width: 800px;
-        margin: 0 auto;
     `
 
     const handleSubmit = useCallback(
@@ -116,14 +120,14 @@ export const Chat = () => {
             gutterSize="none"
             css={containerStyles}
         >
-            {/* Header - only show when there are messages */}
+            <EuiSpacer size="m" />
+
             {messages.length > 0 && (
                 <NewConversationHeader onClick={clearChat} />
             )}
 
-            {/* Messages */}
             <EuiFlexItem grow={true} css={scrollContainerStyles}>
-                <div ref={scrollRef} css={scrollableStyles}>
+                <div ref={scrollRef} css={dynamicScrollableStyles}>
                     {messages.length === 0 ? (
                         <EuiEmptyPrompt
                             iconType="logoElastic"
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/ChatMessage.tsx b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/ChatMessage.tsx
index 1ca625efb..856c7addd 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/ChatMessage.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/ChatMessage.tsx
@@ -1,41 +1,63 @@
+import { initCopyButton } from '../../../copybutton'
 import { ChatMessage as ChatMessageType } from './chat.store'
 import { LlmGatewayMessage } from './useLlmGateway'
 import {
+    EuiAvatar,
+    EuiButtonIcon,
+    EuiCallOut,
+    EuiCopy,
     EuiFlexGroup,
     EuiFlexItem,
+    EuiIcon,
+    EuiLoadingElastic,
     EuiLoadingSpinner,
-    EuiMarkdownFormat,
     EuiPanel,
     EuiSpacer,
     EuiText,
-    EuiButtonIcon,
     EuiToolTip,
     useEuiTheme,
-    EuiCallOut,
-    EuiIcon,
-    EuiAvatar,
-    EuiCopy,
-    EuiLoadingElastic,
 } from '@elastic/eui'
 import { css } from '@emotion/react'
+import DOMPurify from 'dompurify'
+import hljs from 'highlight.js/lib/core'
+import { Marked, RendererObject, Tokens } from 'marked'
 import * as React from 'react'
+import { useEffect, useMemo } from 'react'
+
+// Create the marked instance once globally (renderer never changes)
+const createMarkedInstance = () => {
+    const renderer: RendererObject = {
+        code({ text, lang }: Tokens.Code): string {
+            const highlighted = lang
+                ? hljs.highlight(text, { language: lang }).value
+                : hljs.highlightAuto(text).value
+            return `<div class="highlight">
+                <pre>
+                    <code class="language-${lang}">${highlighted}</code>
+                </pre>
+            </div>`
+        },
+    }
+    return new Marked({ renderer })
+}
+
+const markedInstance = createMarkedInstance()
 
 interface ChatMessageProps {
     message: ChatMessageType
     llmMessages?: LlmGatewayMessage[]
+    streamingContent?: string
     error?: Error | null
     onRetry?: () => void
 }
 
-// Helper function to accumulate AI message content
 const getAccumulatedContent = (messages: LlmGatewayMessage[]) => {
     return messages
-        .filter((m) => m.type === 'ai_message_chunk') // Only accumulate chunks, not the final message
+        .filter((m) => m.type === 'ai_message_chunk')
         .map((m) => m.data.content)
         .join('')
 }
 
-// Derived state helper for readability
 const getMessageState = (message: ChatMessageType) => ({
     isUser: message.type === 'user',
     isLoading: message.status === 'streaming',
@@ -43,29 +65,6 @@ const getMessageState = (message: ChatMessageType) => ({
     hasError: message.status === 'error',
 })
 
-// Extracted styles for markdown render
-const markdownFormatStyles = css`
-    .euiScreenReaderOnly {
-        display: none;
-    }
-    font-size: 14px;
-    b,
-    strong {
-        font-weight: 600;
-    }
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-        b,
-        strong {
-            font-weight: inherit;
-        }
-    }
-`
-
 // Action bar for complete AI messages
 const ActionBar = ({
     content,
@@ -129,6 +128,7 @@ const ActionBar = ({
 export const ChatMessage = ({
     message,
     llmMessages = [],
+    streamingContent,
     error,
     onRetry,
 }: ChatMessageProps) => {
@@ -168,14 +168,38 @@ export const ChatMessage = ({
         )
     }
 
-    // AI message
     const content =
-        llmMessages.length > 0
+        streamingContent ||
+        (llmMessages.length > 0
             ? getAccumulatedContent(llmMessages)
-            : message.content
+            : message.content)
 
     const hasError = message.status === 'error' || !!error
 
+    const parsed = useMemo(() => {
+        const html = markedInstance.parse(content) as string
+        return DOMPurify.sanitize(html)
+    }, [content])
+
+    const ref = React.useRef<HTMLDivElement>(null)
+
+    useEffect(() => {
+        if (isComplete && ref.current) {
+            const timer = setTimeout(() => {
+                try {
+                    initCopyButton(
+                        '.highlight pre',
+                        ref.current!,
+                        'ai-message-codecell-'
+                    )
+                } catch (error) {
+                    console.error('Failed to initialize copy buttons:', error)
+                }
+            }, 100)
+            return () => clearTimeout(timer)
+        }
+    }, [isComplete])
+
     return (
         <EuiFlexGroup
             gutterSize="s"
@@ -222,9 +246,20 @@ export const ChatMessage = ({
                     `}
                 >
                     {content && (
-                        <EuiMarkdownFormat css={markdownFormatStyles}>
-                            {content}
-                        </EuiMarkdownFormat>
+                        // <EuiMarkdownFormat css={markdownFormatStyles}>
+                        //     {content}
+                        // </EuiMarkdownFormat>
+                        <div
+                            ref={ref}
+                            className="markdown-content"
+                            css={css`
+                                font-size: 14px;
+                                & > *:first-child {
+                                    margin-top: 0;
+                                }
+                            `}
+                            dangerouslySetInnerHTML={{ __html: parsed }}
+                        />
                     )}
 
                     {isLoading && (
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/StreamingAiMessage.tsx b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/StreamingAiMessage.tsx
index 865f65ece..29581f0ad 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/StreamingAiMessage.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/StreamingAiMessage.tsx
@@ -27,7 +27,6 @@ export const StreamingAiMessage = ({
         onMessage: (llmMessage) => {
             if (llmMessage.type === 'ai_message_chunk') {
                 contentRef.current += llmMessage.data.content
-                updateAiMessage(message.id, contentRef.current, 'streaming')
             } else if (llmMessage.type === 'agent_end') {
                 updateAiMessage(message.id, contentRef.current, 'complete')
             }
@@ -41,8 +40,6 @@ export const StreamingAiMessage = ({
         },
     })
 
-    // Send question when this is the last message and status is streaming
-    // Use store-level tracking so it persists across remounts
     useEffect(() => {
         if (
             isLast &&
@@ -68,6 +65,11 @@ export const StreamingAiMessage = ({
         <ChatMessage
             message={message}
             llmMessages={isLast ? llmMessages : []}
+            streamingContent={
+                isLast && message.status === 'streaming'
+                    ? contentRef.current
+                    : undefined
+            }
         />
     )
 }
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/highlight-worker.ts b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/highlight-worker.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.tsx b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.tsx
index 26ab7fe4b..fb0883ed6 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.tsx
@@ -3,10 +3,14 @@ import { useChatActions } from '../AskAi/chat.store'
 import { useModalActions } from '../modal.store'
 import { SearchResults } from './SearchResults'
 import { useSearchActions, useSearchTerm } from './search.store'
-import { EuiFieldSearch, EuiSpacer, EuiButton, useEuiTheme } from '@elastic/eui'
+import { EuiFieldSearch, EuiSpacer, EuiButton } from '@elastic/eui'
 import { css } from '@emotion/react'
 import * as React from 'react'
 
+const askAiButtonStyles = css`
+    font-weight: bold;
+`
+
 export const Search = () => {
     const searchTerm = useSearchTerm()
     const { setSearchTerm } = useSearchActions()
@@ -53,17 +57,9 @@ export const Search = () => {
 }
 
 const AskAiButton = ({ term, onAsk }: { term: string; onAsk: () => void }) => {
-    const { euiTheme } = useEuiTheme()
     return (
         <EuiButton iconType="newChat" fullWidth onClick={onAsk}>
-            Ask AI about{' '}
-            <span
-                css={css`
-                    font-weight: ${euiTheme.font.weight.bold};
-                `}
-            >
-                "{term}"
-            </span>
+            Ask AI about <span css={askAiButtonStyles}>"{term}"</span>
         </EuiButton>
     )
 }
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/SearchOrAskAiModal.tsx b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/SearchOrAskAiModal.tsx
index c48894365..ec1b7f269 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/SearchOrAskAiModal.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/SearchOrAskAiModal.tsx
@@ -2,7 +2,6 @@ import { Chat } from './AskAi/Chat'
 import { Search } from './Search/Search'
 import { useModalActions, useModalMode } from './modal.store'
 import {
-    EuiSpacer,
     EuiBetaBadge,
     EuiText,
     EuiLink,
@@ -14,7 +13,7 @@ import { css } from '@emotion/react'
 import * as React from 'react'
 import { useMemo } from 'react'
 
-export const SearchOrAskAiModal = () => {
+export const SearchOrAskAiModal = React.memo(() => {
     const modalMode = useModalMode()
     const { setModalMode } = useModalActions()
 
@@ -30,12 +29,7 @@ export const SearchOrAskAiModal = () => {
                 id: 'askAi',
                 name: 'Ask AI',
                 prepend: <EuiIcon type="sparkles" />,
-                content: (
-                    <>
-                        <EuiSpacer size="m" />
-                        <Chat />
-                    </>
-                ),
+                content: <Chat />,
             },
         ],
         []
@@ -53,7 +47,7 @@ export const SearchOrAskAiModal = () => {
             <ModalFooter />
         </>
     )
-}
+})
 
 const ModalFooter = () => {
     return (
diff --git a/src/Elastic.Documentation.Site/package-lock.json b/src/Elastic.Documentation.Site/package-lock.json
index c9e56b42d..ea33cc429 100644
--- a/src/Elastic.Documentation.Site/package-lock.json
+++ b/src/Elastic.Documentation.Site/package-lock.json
@@ -16,12 +16,12 @@
         "@r2wc/react-to-web-component": "2.1.0",
         "@tanstack/react-query": "^5.87.4",
         "@uidotdev/usehooks": "2.4.1",
-        "clipboard": "2.0.11",
         "dompurify": "3.2.7",
         "highlight.js": "11.11.1",
         "htmx-ext-head-support": "2.0.4",
         "htmx-ext-preload": "2.1.1",
         "htmx.org": "2.0.7",
+        "marked": "16.4.0",
         "select-dom": "9.4.0",
         "tailwindcss": "4.1.13",
         "tippy.js": "6.3.7",
@@ -8757,16 +8757,6 @@
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
       "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
     },
-    "node_modules/clipboard": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
-      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "dependencies": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
-      }
-    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -9079,11 +9069,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-    },
     "node_modules/dequal": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -10101,14 +10086,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
-      "dependencies": {
-        "delegate": "^3.1.2"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -12579,6 +12556,17 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/marked": {
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-16.4.0.tgz",
+      "integrity": "sha512-CTPAcRBq57cn3R8n3hwc2REddc28hjR7RzDXQ+lXLmMJYqn20BaI2cGw6QjgZGIgVfp2Wdfw4aMzgNteQ6qJgQ==",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -14380,11 +14368,6 @@
         "loose-envify": "^1.1.0"
       }
     },
-    "node_modules/select": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
-    },
     "node_modules/select-dom": {
       "version": "9.4.0",
       "resolved": "https://registry.npmjs.org/select-dom/-/select-dom-9.4.0.tgz",
@@ -14957,11 +14940,6 @@
       "resolved": "https://registry.npmjs.org/text-diff/-/text-diff-1.0.1.tgz",
       "integrity": "sha512-jAnlP3ggZk7FeLX1awaMR8Y2sMyil9P9FXvNjaIJIQBAom1zvpKGGH31htOVrUFp0vlyygmJJpNrbJ4rfjsxrA=="
     },
-    "node_modules/tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
diff --git a/src/Elastic.Documentation.Site/package.json b/src/Elastic.Documentation.Site/package.json
index 5abeb19d7..aac2e0d9f 100644
--- a/src/Elastic.Documentation.Site/package.json
+++ b/src/Elastic.Documentation.Site/package.json
@@ -88,12 +88,12 @@
     "@r2wc/react-to-web-component": "2.1.0",
     "@tanstack/react-query": "^5.87.4",
     "@uidotdev/usehooks": "2.4.1",
-    "clipboard": "2.0.11",
     "dompurify": "3.2.7",
     "highlight.js": "11.11.1",
     "htmx-ext-head-support": "2.0.4",
     "htmx-ext-preload": "2.1.1",
     "htmx.org": "2.0.7",
+    "marked": "16.4.0",
     "select-dom": "9.4.0",
     "tailwindcss": "4.1.13",
     "tippy.js": "6.3.7",