diff --git a/x-pack/plugins/fleet/server/routes/settings/index.ts b/x-pack/plugins/fleet/server/routes/settings/index.ts
index 72a4eaf6d626f3..31bbf61db2a51b 100644
--- a/x-pack/plugins/fleet/server/routes/settings/index.ts
+++ b/x-pack/plugins/fleet/server/routes/settings/index.ts
@@ -122,7 +122,7 @@ export const registerRoutes = (router: FleetAuthzRouter, config: FleetConfigType
       },
       description: `Get settings`,
       options: {
-        tags: ['Fleet internals'],
+        tags: ['oas-tag:Fleet internals'],
       },
     })
     .addVersion(
@@ -153,7 +153,7 @@ export const registerRoutes = (router: FleetAuthzRouter, config: FleetConfigType
       },
       description: `Update settings`,
       options: {
-        tags: ['Fleet internals'],
+        tags: ['oas-tag:Fleet internals'],
       },
     })
     .addVersion(
@@ -184,7 +184,7 @@ export const registerRoutes = (router: FleetAuthzRouter, config: FleetConfigType
       },
       description: `Get enrollment settings`,
       options: {
-        tags: ['Fleet internals'],
+        tags: ['oas-tag:Fleet internals'],
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/fleet/server/routes/setup/index.ts b/x-pack/plugins/fleet/server/routes/setup/index.ts
index 3c99185c8421a0..e465ca4d9ec1dc 100644
--- a/x-pack/plugins/fleet/server/routes/setup/index.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/index.ts
@@ -45,7 +45,7 @@ export const registerFleetSetupRoute = (router: FleetAuthzRouter) => {
       },
       description: `Initiate Fleet setup`,
       options: {
-        tags: ['Fleet internals'],
+        tags: ['oas-tag:Fleet internals'],
       },
     })
     .addVersion(
@@ -80,7 +80,7 @@ export const registerCreateFleetSetupRoute = (router: FleetAuthzRouter) => {
       },
       description: `Initiate agent setup`,
       options: {
-        tags: ['Elastic Agents'],
+        tags: ['oas-tag:Elastic Agents'],
       },
     })
     .addVersion(
@@ -111,7 +111,7 @@ export const registerGetFleetStatusRoute = (router: FleetAuthzRouter) => {
       },
       description: `Get agent setup info`,
       options: {
-        tags: ['Elastic Agents'],
+        tags: ['oas-tag:Elastic Agents'],
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/fleet/server/routes/uninstall_token/index.ts b/x-pack/plugins/fleet/server/routes/uninstall_token/index.ts
index 10db178b734fa3..21b69adb0d4b23 100644
--- a/x-pack/plugins/fleet/server/routes/uninstall_token/index.ts
+++ b/x-pack/plugins/fleet/server/routes/uninstall_token/index.ts
@@ -32,7 +32,7 @@ export const registerRoutes = (router: FleetAuthzRouter, config: FleetConfigType
         },
         description: 'List metadata for latest uninstall tokens per agent policy',
         options: {
-          tags: ['Fleet uninstall tokens'],
+          tags: ['oas-tag:Fleet uninstall tokens'],
         },
       })
       .addVersion(
@@ -75,7 +75,7 @@ export const registerRoutes = (router: FleetAuthzRouter, config: FleetConfigType
         },
         description: 'Get one decrypted uninstall token by its ID',
         options: {
-          tags: ['Fleet uninstall tokens'],
+          tags: ['oas-tag:Fleet uninstall tokens'],
         },
       })
       .addVersion(