diff --git a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
index 205a0d573..7c7fe115d 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -18,6 +18,7 @@ import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
@@ -60,6 +61,15 @@ public class OpenApiConfig {
 
         OpenAPI openAPI = new OpenAPI().info(info).openapi("3.0.3");
 
+        // Register a single global "AI" tag so every AI endpoint groups under it in the docs.
+        // The AI controllers are currently @Hidden, so they don't emit this tag themselves yet;
+        // defining it here keeps the grouping ready for when those endpoints are unhidden.
+        openAPI.addTagsItem(
+                new Tag()
+                        .name("AI")
+                        .description(
+                                "AI-powered document creation, editing, and assistant endpoints."));
+
         // Add server configuration from environment variable
         String swaggerServerUrl = System.getenv("SWAGGER_SERVER_URL");
         Server server;
diff --git a/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateController.java b/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateController.java
index 85520a239..848d596d8 100644
--- a/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateController.java
+++ b/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateController.java
@@ -29,6 +29,9 @@ import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBo
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.RequiredArgsConstructor;
@@ -48,6 +51,8 @@ import stirling.software.saas.util.CreditHeaderUtils;
 @RestController
 @Profile("saas")
 @RequestMapping("/api/v1/ai/create")
+@Tag(name = "AI")
+@Hidden
 @RequiredArgsConstructor
 @Slf4j
 public class AiCreateController {
diff --git a/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateInternalController.java b/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateInternalController.java
index 34c44176e..bf2e4894e 100644
--- a/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateInternalController.java
+++ b/app/saas/src/main/java/stirling/software/saas/ai/controller/AiCreateInternalController.java
@@ -17,6 +17,9 @@ import org.springframework.web.server.ResponseStatusException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -27,6 +30,8 @@ import stirling.software.saas.ai.service.AiCreateSessionService;
 @RestController
 @Profile("saas")
 @RequestMapping("/api/v1/ai/create/internal")
+@Tag(name = "AI")
+@Hidden
 @RequiredArgsConstructor
 @Slf4j
 public class AiCreateInternalController {
diff --git a/app/saas/src/main/java/stirling/software/saas/ai/controller/AiProxyController.java b/app/saas/src/main/java/stirling/software/saas/ai/controller/AiProxyController.java
index 074da8707..8b6ae714a 100644
--- a/app/saas/src/main/java/stirling/software/saas/ai/controller/AiProxyController.java
+++ b/app/saas/src/main/java/stirling/software/saas/ai/controller/AiProxyController.java
@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +36,8 @@ import stirling.software.saas.util.CreditHeaderUtils;
 @RestController
 @Profile("saas")
 @RequestMapping("/api/v1/ai")
+@Tag(name = "AI")
+@Hidden
 @Slf4j
 public class AiProxyController {
 
diff --git a/app/saas/src/main/java/stirling/software/saas/controller/CreditController.java b/app/saas/src/main/java/stirling/software/saas/controller/CreditController.java
index 9459c8bbb..2c1be26f4 100644
--- a/app/saas/src/main/java/stirling/software/saas/controller/CreditController.java
+++ b/app/saas/src/main/java/stirling/software/saas/controller/CreditController.java
@@ -36,6 +36,7 @@ public class CreditController {
     private final CreditService creditService;
 
     @GetMapping
+    @Hidden
     @Operation(
             summary = "Get user credit information",
             description =
@@ -252,6 +253,7 @@ public class CreditController {
     }
 
     @GetMapping("/usage")
+    @Hidden
     @Operation(
             summary = "Get credit usage summary",
             description = "Get overview of credit usage (for authenticated user or admin view)")