diff --git a/packages/cms/keystatic/src/content-renderer.tsx b/packages/cms/keystatic/src/content-renderer.tsx
index e25c25729..0fceb95af 100644
--- a/packages/cms/keystatic/src/content-renderer.tsx
+++ b/packages/cms/keystatic/src/content-renderer.tsx
@@ -1,3 +1,3 @@
 export function KeystaticContentRenderer(props: { content: unknown }) {
-  return <div dangerouslySetInnerHTML={{ __html: props.content as string }} />;
+  return <div>{props.content as React.ReactNode}</div>;
 }
diff --git a/packages/cms/keystatic/src/custom-components.tsx b/packages/cms/keystatic/src/custom-components.tsx
new file mode 100644
index 000000000..976c48dbd
--- /dev/null
+++ b/packages/cms/keystatic/src/custom-components.tsx
@@ -0,0 +1,32 @@
+/**
+ * @name CustomMarkdocComponents
+ * @description Custom components for Markdoc. Please define your custom components here.
+ * @example
+ *
+ * ```ts
+ * function Youtube(props: { src: string }) { ... }
+ *
+ * export const CustomMarkdocComponents: Record<string, React.ComponentType<never>> = {
+ *   Youtube,
+ * };
+ */
+export const CustomMarkdocComponents: Record<
+  string,
+  React.ComponentType<never>
+> = {
+  // define your custom components here
+};
+
+/**
+ * @name CustomMarkdocTags
+ * @description Custom tags for Markdoc. Please define your custom tags here.
+ * @example
+ * export const CustomMarkdocTags = {
+ *  youtube: {
+ *     render: "Youtube",
+ *  }
+ * }
+ */
+export const CustomMarkdocTags = {
+  // define your custom tags here
+};
diff --git a/packages/cms/keystatic/src/keystatic-client.ts b/packages/cms/keystatic/src/keystatic-client.ts
index bdd4445b5..bab46f055 100644
--- a/packages/cms/keystatic/src/keystatic-client.ts
+++ b/packages/cms/keystatic/src/keystatic-client.ts
@@ -1,6 +1,12 @@
+import React from 'react';
+
 import { Cms, CmsClient } from '@kit/cms';
 
 import { createKeystaticReader } from './create-reader';
+import {
+  CustomMarkdocComponents,
+  CustomMarkdocTags,
+} from './custom-components';
 import { PostEntryProps } from './keystatic.config';
 
 export function createKeystaticClient() {
@@ -158,8 +164,14 @@ class KeystaticClient implements CmsClient {
       : new Date();
 
     const markdoc = await item.entry.content();
-    const content = transform(markdoc.node);
-    const html = renderers.html(content);
+
+    const content = transform(markdoc.node, {
+      tags: CustomMarkdocTags,
+    });
+
+    const html = renderers.react(content, React, {
+      components: CustomMarkdocComponents,
+    });
 
     return {
       id: item.slug,
@@ -168,7 +180,7 @@ class KeystaticClient implements CmsClient {
       slug: item.slug,
       description: item.entry.description,
       publishedAt: publishedAt.toISOString(),
-      content: html,
+      content: html as string,
       image: item.entry.image ?? undefined,
       status: item.entry.status,
       categories: