diff --git a/docs/TROUBLESHOOTING_TEMPLATE.mdx b/docs/TROUBLESHOOTING_TEMPLATE.mdx
index 63c1129c1f..778951ba16 100644
--- a/docs/TROUBLESHOOTING_TEMPLATE.mdx
+++ b/docs/TROUBLESHOOTING_TEMPLATE.mdx
@@ -9,6 +9,7 @@ dates:
 categories:
   - XXXXX
 ---
+import TroubleshootingTicket from '@macros/general/troubleshooting-ticket.mdx'
 
 ## Problem
 
@@ -45,4 +46,4 @@ Provide links to documentation pages that may be useful if the issue has not bee
 
 If required, add a paragraph containing elements to provide the support with when creating a support ticket.
 
-<Macro id="troubleshooting-ticket" />
\ No newline at end of file
+<TroubleshootingTicket />
\ No newline at end of file
diff --git a/macros/ai/ai-generative-apis.mdx b/macros/ai/ai-generative-apis.mdx
new file mode 100644
index 0000000000..720a7685bc
--- /dev/null
+++ b/macros/ai/ai-generative-apis.mdx
@@ -0,0 +1,5 @@
+---
+macro: ai-generative-apis
+---
+
+Generative APIs provide access to pre-configured serverless endpoints of the most popular AI models, hosted in European data centers and priced per 1M tokens used.
\ No newline at end of file
diff --git a/macros/ai/ai-managed-inference.mdx b/macros/ai/ai-managed-inference.mdx
new file mode 100644
index 0000000000..88af0732da
--- /dev/null
+++ b/macros/ai/ai-managed-inference.mdx
@@ -0,0 +1,5 @@
+---
+macro: ai-managed-inference
+---
+
+Effortlessly deploy AI models on a sovereign infrastructure, manage and scale inference with full data privacy. Start now with a simple interface for creating dedicated endpoints.
\ No newline at end of file
diff --git a/pages/key-manager/faq.mdx b/pages/key-manager/faq.mdx
index 3c1a449964..ef70208155 100644
--- a/pages/key-manager/faq.mdx
+++ b/pages/key-manager/faq.mdx
@@ -6,6 +6,8 @@ dates:
 productIcon: KmsProductIcon
 ---
 
+import Encryption from '@macros/key-manager/encryption.mdx'
+
 ## Why should you use Scaleway Key Manager?
 
 Key Manager helps organizations achieve secure key management by handling low-level and error-prone cryptographic details for you.
@@ -28,7 +30,7 @@ Key Manager supports the three following cryptographic operations:
 
 ## Which algorithms and key usage does Key Manager support?
 
-<Macro id="encryption" />
+<Encryption />
 
 Keys with a [key usage](/key-manager/concepts/#key-usage) set to `symmetric_encryption` are **used to encrypt and decrypt data**.
 
diff --git a/pages/organizations-and-projects/additional-content/organization-quotas.mdx b/pages/organizations-and-projects/additional-content/organization-quotas.mdx
index cc69f55b8b..f9c26a4fea 100644
--- a/pages/organizations-and-projects/additional-content/organization-quotas.mdx
+++ b/pages/organizations-and-projects/additional-content/organization-quotas.mdx
@@ -27,6 +27,8 @@ import NetworkLoadBalancer from '@macros/network/load-balancer.mdx'
 import NetworkPublicGateways from '@macros/network/public-gateways.mdx'
 import StorageManagedDatabases from '@macros/storage/managed-databases.mdx'
 import StorageObjectStorage from '@macros/storage/object-storage.mdx'
+import AiManagedInference from '@macros/ai/ai-managed-inference.mdx'
+import AiGenerativeApis from '@macros/ai/ai-generative-apis.mdx'
 
 
 Every [Organization](/iam/concepts/#organization) has quotas, which are limits on the number of Scaleway resources they can use. Below is a list of quotas available for each resource.
@@ -173,7 +175,8 @@ At Scaleway, quotas are applicable per [Organization](/iam/concepts/#organizatio
 
 ## Managed Inference
 
-<Macro id="ai-managed-inference" />
+<AiManagedInference />
+
 Managed Inference Deployments are limited to a maximum number of nodes, depending on the node types provisioned.
 
 <Message type="important">
@@ -187,7 +190,7 @@ Managed Inference Deployments are limited to a maximum number of nodes, dependin
 
 ## Generative APIs
 
-<Macro id="ai-generative-apis" />
+<AiGenerativeApis />
 
 Generative APIs are rate limited based on:
 - Tokens per minute (total input and output tokens)