diff --git a/apps/docs/components/docusaurus/code-block.tsx b/apps/docs/components/docusaurus/code-block.tsx
deleted file mode 100644
index eccba78d3..000000000
--- a/apps/docs/components/docusaurus/code-block.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-export default function CodeBlock({ children, language, title, className, showLineNumbers: _showLineNumbers }: any) {
-  return (
-    <div className="my-4">
-      {title && <div className="bg-secondary text-secondary-foreground px-4 py-2 text-sm font-medium rounded-t-md">{title}</div>}
-      <pre className={`p-4 overflow-x-auto bg-secondary/50 rounded-b-md ${title ? 'rounded-t-none' : 'rounded-md'} ${className || ''}`}>
-        <code className={language ? `language-${language}` : ''}>
-          {children}
-        </code>
-      </pre>
-    </div>
-  );
-}
diff --git a/apps/docs/content/guides/integrate/actions/testing-request-signature.mdx b/apps/docs/content/guides/integrate/actions/testing-request-signature.mdx
index 04607a224..d66ddd2ac 100644
--- a/apps/docs/content/guides/integrate/actions/testing-request-signature.mdx
+++ b/apps/docs/content/guides/integrate/actions/testing-request-signature.mdx
@@ -2,10 +2,10 @@
 title: Verify Payload Integrity
 ---
 
-import JSONCode from "./go/json.go";
-import JWTCode from "./go/jwt.go";
-import JWECode from "./go/jwe.go";
-import CodeBlock from "@/components/docusaurus/code-block";
+import JsonGo from './go/json.go';
+import JwtGo from './go/jwt.go';
+import JweGo from './go/jwe.go';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
 This guide shows you how to verify the integrity of the received data on your target.
 There are three options available, which will be demonstrated in the following sections.
@@ -133,13 +133,13 @@ As mentioned before, this validation can and should be applied to any target imp
 
 <Tabs>
     <Tab value="JSON">
-        <CodeBlock language="go">{JSONCode}</CodeBlock>
+        <DynamicCodeBlock lang="go" code={JsonGo} />
     </Tab>
     <Tab value="JWT">
-        <CodeBlock language="go">{JWTCode}</CodeBlock>
+        <DynamicCodeBlock lang="go" code={JwtGo} />
     </Tab>
     <Tab value="JWE">
-        <CodeBlock language="go">{JWECode}</CodeBlock>
+        <DynamicCodeBlock lang="go" code={JweGo} />
     </Tab>
 </Tabs>
 
diff --git a/apps/docs/content/self-hosting/deploy/compose.mdx b/apps/docs/content/self-hosting/deploy/compose.mdx
index d0b266414..1a835ec93 100644
--- a/apps/docs/content/self-hosting/deploy/compose.mdx
+++ b/apps/docs/content/self-hosting/deploy/compose.mdx
@@ -3,10 +3,10 @@ title: Set up Zitadel with Docker Compose
 sidebar_label: Docker Compose
 ---
 
-import CodeBlock from '@/components/docusaurus/code-block';
 import NoteInstanceNotFound from './troubleshooting/_note_instance_not_found.mdx';
+import DockerCompose from './docker-compose.yaml';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
-import DockerComposeSource from "./docker-compose.yaml"
 import Disclaimer from './_disclaimer.mdx'
 import DefaultUser from './_defaultuser.mdx'
 import Next from './_next.mdx'
@@ -54,7 +54,7 @@ The comments give context to the used variables and show examples for commonly u
 
 <details>
     <summary>docker-compose.yaml</summary>
-    <CodeBlock  language="yaml">{DockerComposeSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={DockerCompose} />
 </details>
 
 Here are some natural steps forward to go from the current setup to production:
diff --git a/apps/docs/content/self-hosting/manage/configure/_compose.mdx b/apps/docs/content/self-hosting/manage/configure/_compose.mdx
index 4192a32c0..1282003d4 100644
--- a/apps/docs/content/self-hosting/manage/configure/_compose.mdx
+++ b/apps/docs/content/self-hosting/manage/configure/_compose.mdx
@@ -2,12 +2,11 @@
 title: Download the docker compose example configuration.
 ---
 
-import CodeBlock from '@/components/docusaurus/code-block';
-
-import DockerComposeSource from "./docker-compose.yaml"
-import ExampleZITADELConfigSource from "./example-zitadel-config.yaml"
-import ExampleZITADELSecretsSource from "./example-zitadel-secrets.yaml"
-import ExampleZITADELInitStepsSource from "./example-zitadel-init-steps.yaml"
+import DockerComposeYaml from './docker-compose.yaml';
+import ExampleZitadelConfig from './example-zitadel-config.yaml';
+import ExampleZitadelSecrets from './example-zitadel-secrets.yaml';
+import ExampleZitadelInitSteps from './example-zitadel-init-steps.yaml';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
 The docker compose example mounts the example zitadel configuration files to the ZITADEL container.
 
@@ -15,36 +14,36 @@ By executing the commands below, you will download the following files:
 
 <details>
     <summary>docker-compose.yaml</summary>
-    <CodeBlock  language="yaml">{DockerComposeSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={DockerComposeYaml} />
 </details>
 
 <details>
     <summary>example-zitadel-config.yaml</summary>
-    <CodeBlock  language="yaml">{ExampleZITADELConfigSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={ExampleZitadelConfig} />
 </details>
 
 <details>
     <summary>example-zitadel-secrets.yaml</summary>
-    <CodeBlock  language="yaml">{ExampleZITADELSecretsSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={ExampleZitadelSecrets} />
 </details>
 
 <details>
     <summary>example-zitadel-init-steps.yaml</summary>
-    <CodeBlock  language="yaml">{ExampleZITADELInitStepsSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={ExampleZitadelInitSteps} />
 </details>
 
 ```bash
 # Download the docker compose example configuration.
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/docker-compose.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/docker-compose.yaml
 
 # Download and adjust the example configuration file containing standard configuration.
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/example-zitadel-config.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/example-zitadel-config.yaml
 
 # Download and adjust the example configuration file containing secret configuration.
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/example-zitadel-secrets.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/example-zitadel-secrets.yaml
 
 # Download and adjust the example configuration file containing database initialization configuration.
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/example-zitadel-init-steps.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/example-zitadel-init-steps.yaml
 
 # A single ZITADEL instance always needs the same 32 bytes long masterkey
 # Generate one to a file if you haven't done so already and pass it as environment variable
diff --git a/apps/docs/content/self-hosting/manage/configure/_linuxunix.mdx b/apps/docs/content/self-hosting/manage/configure/_linuxunix.mdx
index a2fa8f9c0..4c34f369e 100644
--- a/apps/docs/content/self-hosting/manage/configure/_linuxunix.mdx
+++ b/apps/docs/content/self-hosting/manage/configure/_linuxunix.mdx
@@ -2,11 +2,10 @@
 title: Download and adjust the example configuration file containing standard configuration
 ---
 
-import CodeBlock from '@/components/docusaurus/code-block';
-
-import ExampleZITADELConfigSource from "./example-zitadel-config.yaml"
-import ExampleZITADELSecretsSource from "./example-zitadel-secrets.yaml"
-import ExampleZITADELInitStepsSource from "./example-zitadel-init-steps.yaml"
+import ExampleZitadelConfig from './example-zitadel-config.yaml';
+import ExampleZitadelSecrets from './example-zitadel-secrets.yaml';
+import ExampleZitadelInitSteps from './example-zitadel-init-steps.yaml';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
 ### Configure by Files
 
@@ -14,28 +13,28 @@ By executing the commands below, you will download the following files:
 
 <details>
     <summary>example-zitadel-config.yaml</summary>
-    <CodeBlock  language="yaml">{ExampleZITADELConfigSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={ExampleZitadelConfig} />
 </details>
 
 <details>
     <summary>example-zitadel-secrets.yaml</summary>
-    <CodeBlock  language="yaml">{ExampleZITADELSecretsSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={ExampleZitadelSecrets} />
 </details>
 
 <details>
     <summary>example-zitadel-init-steps.yaml</summary>
-    <CodeBlock  language="yaml">{ExampleZITADELInitStepsSource}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={ExampleZitadelInitSteps} />
 </details>
 
 ```bash
 # Download and adjust the example configuration file containing standard configuration
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/example-zitadel-config.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/example-zitadel-config.yaml
 
 # Download and adjust the example configuration file containing secret configuration
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/example-zitadel-secrets.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/example-zitadel-secrets.yaml
 
 # Download and adjust the example configuration file containing database initialization configuration
-wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/configure/example-zitadel-init-steps.yaml
+wget https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/configure/example-zitadel-init-steps.yaml
 
 # A single ZITADEL instance always needs the same 32 characters long masterkey
 # If you haven't done so already, you can generate a new one
diff --git a/apps/docs/content/self-hosting/manage/configure/configure.mdx b/apps/docs/content/self-hosting/manage/configure/configure.mdx
index 65e2120f6..98378949f 100644
--- a/apps/docs/content/self-hosting/manage/configure/configure.mdx
+++ b/apps/docs/content/self-hosting/manage/configure/configure.mdx
@@ -7,10 +7,10 @@ import LinuxUnix from "./_linuxunix.mdx";
 import Compose from "./_compose.mdx";
 import Helm from "./_helm.mdx";
 import Login from "./_login.mdx";
-import CodeBlock from "@/components/docusaurus/code-block";
-import DefaultsYamlSource from "../../../../../../cmd/defaults.yaml";
-import StepsYamlSource from "../../../../../../cmd/setup/steps.yaml";
-import SkipSuperUserDatabaseQueries from "./example-skip-superuser-queries.yaml";
+import DefaultsYaml from '../../../../../../cmd/defaults.yaml';
+import StepsYaml from '../../../../../../cmd/setup/steps.yaml';
+import SkipSuperUserQueries from './example-skip-superuser-queries.yaml';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
 This guide assumes you are familiar with [running ZITADEL using the least amount of configuration possible](/self-hosting/deploy/overview).
 
@@ -27,7 +27,7 @@ For overwriting the default configuration for the first instance created by zita
 
 <details>
   <summary>defaults.yaml</summary>
-  <CodeBlock  language="yaml">{DefaultsYamlSource}</CodeBlock>
+  <DynamicCodeBlock lang="yaml" code={DefaultsYaml} />
 </details>
 
 ### Database initialization file
@@ -42,7 +42,7 @@ By using the FirstInstance section, you can overwrite the [DefaultInstance confi
 
 <details>
   <summary>steps.yaml</summary>
-  <CodeBlock  language="yaml">{StepsYamlSource}</CodeBlock>
+  <DynamicCodeBlock lang="yaml" code={StepsYaml} />
 </details>
 
 ### Pre-existing Database and User
@@ -54,7 +54,7 @@ To skip the checks, you must ensure the database objects (database, user, grant)
 
 <details>
   <summary>skip-superuser-queries-config.yaml</summary>
-  <CodeBlock  language="yaml">{SkipSuperUserDatabaseQueries}</CodeBlock>
+  <DynamicCodeBlock lang="yaml" code={SkipSuperUserQueries} />
 </details>
 
 ### Multiple configuration files
diff --git a/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_overview.mdx b/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_overview.mdx
index 2ee98e4da..960646dd0 100644
--- a/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_overview.mdx
+++ b/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_overview.mdx
@@ -1,16 +1,16 @@
-import CodeBlock from '@/components/docusaurus/code-block';
-import ComposeYaml from "./docker-compose.yaml";
+import BaseDockerCompose from './docker-compose.yaml';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
 <>With these examples, you create and run a minimal {props.link} configuration for Zitadel with <a href="https://docs.docker.com/compose">Docker Compose</a>.
 Whereas the guide focuses on the configuration for {props.name}, you can inspect the settings for the Zitadel API, the Zitadel login and the database in the base Docker Compose file.</>
 <details>
     <summary>base docker-compose.yaml</summary>
-    <CodeBlock  language="yaml">{ComposeYaml}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={BaseDockerCompose} />
 </details>
 
 <>For running {props.name}, you will extend the base Docker Compose file with the {props.name} specific Docker Compose file.</>
 
 <details>
     <summary>specific docker-compose.yaml</summary>
-    <CodeBlock  language="yaml">{props.compose}</CodeBlock>
+    <DynamicCodeBlock lang="yaml" code={props.compose} />
 </details>
diff --git a/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_tls_mode.mdx b/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_tls_mode.mdx
index 1c1d92893..ac3374b9e 100644
--- a/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_tls_mode.mdx
+++ b/apps/docs/content/self-hosting/manage/reverseproxy/_proxy_guide_tls_mode.mdx
@@ -1,4 +1,4 @@
-import CodeBlock from '@/components/docusaurus/code-block';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 
 export const Description = ({mode, name}) => {
     let desc
@@ -37,24 +37,25 @@ export const Commands = ({mode, name, lower, configfilename}) => {
         // We only need that flag for TLS connections with the self-signed cert
         connInsecureFlag = ""
     }
+    const code = [
+        '# Download the configuration files.',
+        'export ZITADEL_CONFIG_FILES=https://raw.githubusercontent.com/zitadel/zitadel/main/apps/docs/content/self-hosting/manage/reverseproxy',
+        'wget ${ZITADEL_CONFIG_FILES}/docker-compose.yaml -O docker-compose-base.yaml --quiet',
+        `wget \${ZITADEL_CONFIG_FILES}/${lower}/docker-compose.yaml -O docker-compose-${lower}.yaml --quiet`,
+        `wget \${ZITADEL_CONFIG_FILES}/${lower}/${configfilename} -O ${configfilename} --quiet`,
+        ...(genCert ? ['', genCert.trimEnd()] : []),
+        '',
+        `# Run the database, and ${name}.`,
+        `docker compose --file docker-compose-base.yaml --file docker-compose-${lower}.yaml up --detach --wait db zitadel-init zitadel-${mode}-tls login-${mode}-tls proxy-${mode}-tls`,
+        '',
+        '# Test that gRPC and HTTP APIs work. Empty brackets like {} means success.',
+        '# Make sure you have the grpcurl cli installed on your machine https://github.com/fullstorydev/grpcurl?tab=readme-ov-file#installation',
+        `grpcurl ${connInsecureFlag}${grpcPlainTextFlag}127.0.0.1.sslip.io:${connPort} zitadel.admin.v1.AdminService/Healthz`,
+        `curl ${connInsecureFlag}${connScheme}://127.0.0.1.sslip.io:${connPort}/admin/v1/healthz`,
+    ].join('\n')
     return (
-        <div>
-            <CodeBlock  language="bash">
-                {'# Download the configuration files.'}{'\n'}
-                {'export ZITADEL_CONFIG_FILES=https://raw.githubusercontent.com/zitadel/zitadel/main/docs/self-hosting/manage/reverseproxy\n'}
-                {'wget ${ZITADEL_CONFIG_FILES}/docker-compose.yaml -O docker-compose-base.yaml --quiet \n'}
-                {'wget ${ZITADEL_CONFIG_FILES}/'}{lower}{'/docker-compose.yaml -O docker-compose-'}{lower}{'.yaml --quiet \n'}
-                {'wget ${ZITADEL_CONFIG_FILES}/'}{lower}{'/'}{configfilename}{' -O '}{configfilename}{' --quiet \n'}
-                {'\n'}
-                {genCert}
-                {'# Run the database,  and '}{name}{'.'}{'\n'}
-                {'docker compose --file docker-compose-base.yaml --file docker-compose-'}{lower}{'.yaml up --detach --wait db zitadel-init zitadel-'}{mode}{'-tls login-'}{mode}{'-tls proxy-'}{mode}{'-tls'}{'\n'}
-                {'\n'}
-                {'# Test that gRPC and HTTP APIs work. Empty brackets like {} means success.\n'}
-                {'# Make sure you have the grpcurl cli installed on your machine https://github.com/fullstorydev/grpcurl?tab=readme-ov-file#installation\n'}
-                {'grpcurl '}{connInsecureFlag}{grpcPlainTextFlag}{'127.0.0.1.sslip.io:'}{connPort}{' zitadel.admin.v1.AdminService/Healthz\n'}
-                {'curl '}{connInsecureFlag}{connScheme}{'://127.0.0.1.sslip.io:'}{connPort}{'/admin/v1/healthz\n'}
-            </CodeBlock>
+        <div className="mt-4">
+            <DynamicCodeBlock lang="bash" code={code} />
         </div>
     )
 }
@@ -72,7 +73,7 @@ export const LoginURL = ({mode}) => {
 
 <details open>
     <summary>{props.configfilename}</summary>
-    <CodeBlock >{props.configfilecontent}</CodeBlock>
+    <DynamicCodeBlock lang={props.lower === 'nginx' ? 'nginx' : props.lower === 'httpd' ? 'conf' : props.lower === 'caddy' ? 'caddy' : 'yaml'} code={props.configfilecontent} />
 </details>
 
 <Commands mode={props.mode} name={props.providername} lower={props.lower} configfilename={props.configfilename}/>
@@ -84,7 +85,4 @@ export const LoginURL = ({mode}) => {
 
 If the management console loads normally, you know that the HTTP and gRPC-Web and gRPC APIs are working correctly.
 
-<CodeBlock  language="bash">
-    {'# You can now stop the database, the Zitadel API, the Zitadel login and '}{props.providername}{'.'}{'\n'}
-    {'docker compose --file docker-compose-base.yaml --file docker-compose-'}{props.lower}{'.yaml down'}{'\n'}
-</CodeBlock>
+<DynamicCodeBlock lang="bash" code={`# You can now stop the database, the Zitadel API, the Zitadel login and ${props.providername}.\ndocker compose --file docker-compose-base.yaml --file docker-compose-${props.lower}.yaml down`} />