diff --git a/src/templates/Swagger/Paths.jsx b/src/templates/Swagger/Paths.jsx
index c92db2cd..45badfd4 100644
--- a/src/templates/Swagger/Paths.jsx
+++ b/src/templates/Swagger/Paths.jsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import slugify from 'slugify'
-import { cleanPathKey } from './utils'
 import styles from './Paths.module.scss'
 import stylesDoc from '../Doc.module.scss'
 
@@ -142,9 +141,9 @@ Method.propTypes = {
 
 const Paths = ({ paths }) =>
   Object.entries(paths).map(([key, value]) => (
-    <div key={key} id={slugify(cleanPathKey(key))}>
+    <div key={key} id={slugify(key)}>
       <h2 className={stylesDoc.pathName}>
-        <code>{cleanPathKey(key)}</code>
+        <code>{key}</code>
       </h2>
 
       {Object.entries(value).map(([key, value]) => (
diff --git a/src/templates/Swagger/Toc.jsx b/src/templates/Swagger/Toc.jsx
index 7bc2e8b0..31d62322 100644
--- a/src/templates/Swagger/Toc.jsx
+++ b/src/templates/Swagger/Toc.jsx
@@ -9,29 +9,47 @@ import stylesSidebar from '../../components/Sidebar.module.scss'
 const Toc = ({ data }) => {
   const Ids = []
 
-  const items = Object.keys(data.paths).map((key) => {
-    Ids.push(slugify(cleanPathKey(key)))
+  const itemsV1 = Object.keys(data.paths)
+    .filter((key) => key.startsWith('/api/v1/aquarius'))
+    .map((key) => {
+      Ids.push(slugify(key))
 
-    return (
-      <li key={key}>
-        <Scroll
-          type="id"
-          element={`${slugify(cleanPathKey(key))}`}
-          offset={-20}
-        >
-          <code>{cleanPathKey(key)}</code>
-        </Scroll>
-      </li>
-    )
-  })
+      return (
+        <li key={key}>
+          <Scroll type="id" element={`${slugify(key)}`} offset={-20}>
+            <code>{cleanPathKey(key)}</code>
+          </Scroll>
+        </li>
+      )
+    })
 
+  const itemsOther = Object.keys(data.paths)
+    .filter((key) => !key.startsWith('/api/v1/aquarius'))
+    .map((key) => {
+      Ids.push(slugify(key))
+
+      return (
+        <li key={key}>
+          <Scroll type="id" element={`${slugify(key)}`} offset={-20}>
+            <code>{key}</code>
+          </Scroll>
+        </li>
+      )
+    })
   return (
     <Scrollspy
       items={Ids}
       currentClassName={stylesSidebar.scrollspyActive}
       offset={-100}
     >
-      {items}
+      <code>/api/v1/aquarius</code>
+      <ul>{itemsV1}</ul>
+      {itemsOther.length ? (
+        <>
+          <code>Other REST endpoints</code>
+          <ul>{itemsOther}</ul>
+        </>
+      ) : null}
     </Scrollspy>
   )
 }
diff --git a/src/templates/Swagger/utils.js b/src/templates/Swagger/utils.js
index 7db3edaf..cee1a678 100644
--- a/src/templates/Swagger/utils.js
+++ b/src/templates/Swagger/utils.js
@@ -4,10 +4,5 @@ export const cleanPathKey = (key) => {
   if (key.includes('aquarius')) {
     keyCleaned = key.replace(/\/api\/v1\/aquarius/gi, '')
   }
-
-  if (key.includes('brizo')) {
-    keyCleaned = key.replace(/\/api\/v1\/brizo/gi, '')
-  }
-
   return keyCleaned
 }