diff --git a/.github/actions/validate/action.yml b/.github/actions/validate/action.yml
index 8ae102db..6802385a 100644
--- a/.github/actions/validate/action.yml
+++ b/.github/actions/validate/action.yml
@@ -49,7 +49,7 @@ runs:
       shell: bash
       run: |
         npm i
-        npm i github:hazelcast/hazelcast-docs-tools#semver:2.4.1
+        npm i github:hazelcast/hazelcast-docs-tools#semver:2.5.0
         ./node_modules/.bin/load-global-playbook -r ${{ inputs.repository-name }} -b ${{ inputs.base-branch-name }} --log-level ${{ inputs.check-links-loader-log-level }} --skip-private-repos --enforce-global-sources
         ./node_modules/.bin/antora --fetch --to-dir test --log-level=warn --log-failure-level=warn --extension=./node_modules/hazelcast-docs-tools/antora-extensions/antora-link-checker-extension.js global-antora-playbook.yml
 
diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml
index 58e8f05c..3f464622 100644
--- a/antora-playbook-local.yml
+++ b/antora-playbook-local.yml
@@ -220,7 +220,6 @@ ui:
     snapshot: true
 antora:
   extensions:
-#    - ./node_modules/hazelcast-docs-tools/antora-extensions/algolia-tags-extension.js
     - require: ./node_modules/hazelcast-docs-tools/antora-extensions/api-json.js
       tags:
         - Favorites
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 0c5f4fc0..e93d231f 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -245,7 +245,6 @@ ui:
         static_files: [ netlify.toml ]
 antora:
   extensions:
-#    - ./node_modules/hazelcast-docs-tools/antora-extensions/algolia-tags-extension.js
     - require: ./node_modules/hazelcast-docs-tools/antora-extensions/api-json.js
       tags:
         - Favorites
diff --git a/lib/algolia-tags-extension.js b/lib/algolia-tags-extension.js
deleted file mode 100644
index 057578a4..00000000
--- a/lib/algolia-tags-extension.js
+++ /dev/null
@@ -1,144 +0,0 @@
-'use strict'
-
-/**
- * Antora extension: algolia-tags
- *
- * Fetches all facet values for the `tags` facet from the Algolia search index,
- * parses each tag as "{component}-{version}", and registers a Handlebars helper
- * that returns a map of component name → sorted version strings.
- *
- * Helper: (get-algolia-versions [componentName])
- *
- * With a component name — returns a sorted version strings array for HBS iteration:
- *   {{#each (get-algolia-versions page.component.name)}} {{this}} {{/each}}
- *
- * Without arguments — returns SafeString JSON of the full map for <script> tags:
- *   window.UTILS.parseHbsJsonString('{{get-algolia-versions}}')
- *
- * Reads credentials from the playbook's site.keys (camelCased by Antora at load time):
- *   - docsearch_id    (→ docsearchId)    → Algolia Application ID
- *   - docsearch_api   (→ docsearchApi)   → Algolia Search API key
- *   - docsearch_index (→ docsearchIndex) → Algolia index name
- *
- * Usage in antora-playbook.yml:
- *   antora:
- *     extensions:
- *       - require: ./lib/algolia-tags-extension.js
- */
-
-const { searchClient } = require('@algolia/client-search')
-
-function sortVersions (versions) {
-  const parse = (v) => {
-    const snapshot = v.toLowerCase().includes('snapshot')
-    const nums = v.replace(/-snapshot/i, '').split('.').map(Number)
-    return { nums, snapshot }
-  }
-  return versions.sort((a, b) => {
-    const pa = parse(a)
-    const pb = parse(b)
-    const len = Math.max(pa.nums.length, pb.nums.length)
-    for (let i = 0; i < len; i++) {
-      const na = pa.nums[i] ?? 0
-      const nb = pb.nums[i] ?? 0
-      if (na !== nb) return nb - na // descending
-    }
-    if (pa.snapshot && !pb.snapshot) return -1
-    if (!pa.snapshot && pb.snapshot) return 1
-    return 0
-  })
-}
-
-module.exports.register = function () {
-  const logger = this.getLogger('algolia-tags-extension')
-  let tagsPromise
-
-  this.on('playbookBuilt', ({ playbook }) => {
-    const keys = playbook.site.keys || {}
-    const appId = keys.docsearchId
-    const apiKey = keys.docsearchApi
-    const indexName = keys.docsearchIndex
-
-    if (!appId || !apiKey || !indexName) {
-      logger.warn('algolia-tags-extension: missing docsearchId, docsearchApi, or docsearchIndex in site.keys — skipping tag fetch')
-      tagsPromise = Promise.resolve([])
-      return
-    }
-
-    logger.info(`algolia-tags-extension: fetching tags from index "${indexName}"`)
-    const client = searchClient(appId, apiKey)
-    tagsPromise = client
-      .searchForFacetValues({
-        indexName,
-        facetName: 'tags',
-        searchForFacetValuesRequest: { maxFacetHits: 100 },
-      })
-      .then((result) => {
-        const tags = (result.facetHits || []).map((hit) => hit.value)
-        logger.info(`algolia-tags-extension: fetched ${tags.length} tag(s)`)
-        return tags
-      })
-      .catch((err) => {
-        logger.error(`algolia-tags-extension: failed to fetch Algolia tags — ${err.message}`)
-        return []
-      })
-  })
-
-  this.on('contentClassified', async ({ contentCatalog, uiCatalog }) => {
-    const tags = await tagsPromise
-
-    // Get component names from the content catalog.
-    const componentNames = contentCatalog.getComponents().map((c) => c.name)
-
-    // Build a lookup of version → url from the content catalog
-    const catalogVersionUrls = {}
-    for (const component of contentCatalog.getComponents()) {
-      catalogVersionUrls[component.name] = {}
-      for (const cv of component.versions || []) {
-        catalogVersionUrls[component.name][cv.version] = cv.url
-      }
-    }
-
-    // Build component → sorted version objects: { version, url }
-    const versionsMap = Object.fromEntries(componentNames.map((name) => [name, []]))
-    for (const tag of tags) {
-      for (const name of componentNames) {
-        if (tag.startsWith(name)) {
-          versionsMap[name].push(tag.replace(`${name}-`))
-          break
-        }
-      }
-    }
-
-    for (const name of componentNames) {
-      sortVersions(versionsMap[name])
-      versionsMap[name] = versionsMap[name].map((version) => ({
-        version,
-        url: catalogVersionUrls[name]?.[version],
-      }))
-    }
-
-    // Helper: (get-algolia-versions [componentName])
-    //
-    // With a component name → returns sorted { version, url } objects for HBS iteration.
-    //   url is null for versions not in the current build.
-    //   {{#each (get-algolia-versions page.component.name)}}
-    //     <a href="{{{relativize this.url}}}">{{this.version}}</a>
-    //   {{/each}}
-    //
-    // Without arguments → returns SafeString JSON of the full map for <script> tags.
-    //   window.UTILS.parseHbsJsonString('{{get-algolia-versions}}')
-    const serializedMap = JSON.stringify(versionsMap)
-    uiCatalog.addFile({
-      type: 'helper',
-      path: 'helpers/get-algolia-versions.js',
-      stem: 'get-algolia-versions',
-      contents: Buffer.from(
-        `'use strict'\nconst Handlebars = require('handlebars')\nconst map = ${serializedMap}\n` +
-        `module.exports = (componentName) => typeof componentName === 'string' ? map[componentName] || [] : new Handlebars.SafeString(JSON.stringify(map))`
-      ),
-    })
-
-    logger.info('algolia-tags-extension: registered (get-algolia-versions) Handlebars helper')
-  })
-}
\ No newline at end of file
diff --git a/lib/api-json.js b/lib/api-json.js
deleted file mode 100644
index af31f58b..00000000
--- a/lib/api-json.js
+++ /dev/null
@@ -1,68 +0,0 @@
-'use strict'
-
-/**
- * Create a JSON file with a summary of the pages
- */
-
-
-module.exports.register = function ({config}) {
-    let content = []
-    const addEntity = ({title, url, tags, type, order}) => {
-        const arr = tags.split(',').map(cat => cat.trim())
-        if (config.tags && !arr.some(name => (config.tags ?? []).includes(name))) {
-            throw Error(`Wrong cloud tag '${arr.join(', ')}' in '${title}'`)
-        }
-        content.push({
-            title: title && title.trim(),
-            url: url && url.trim(),
-            tags: arr,
-            type: type && type.trim(),
-            order: order ? parseInt(order) : 0
-        })
-    }
-    (config.data ?? []).forEach(item => addEntity(item))
-    this.on('documentsConverted', ({contentCatalog}) => {
-        contentCatalog.findBy({family: 'page'}).forEach((item) => {
-            const urlVideo = item.asciidoc.attributes['cloud-url-video']
-            const type = urlVideo ? 'video' : 'article'
-            const url = urlVideo ?? item.pub.url
-            const tags = item.asciidoc.attributes['cloud-tags']
-            const title = item.asciidoc.attributes['cloud-title'] ?? item.title
-            const order = item.asciidoc.attributes['cloud-order']
-            if (tags) {
-                if (title.includes('|')) {
-                    title.split('|').forEach((title_multi, index) => {
-                        const tags_multi = item.asciidoc.attributes['cloud-tags'].split('|')[index]
-                        const order_multi = item.asciidoc.attributes['cloud-order'] ? item.asciidoc.attributes['cloud-order'].split('|')[index] : ''
-                        const anchor_multi = item.asciidoc.attributes['cloud-anchor'] ? item.asciidoc.attributes['cloud-anchor'].split('|')[index] : ''
-                        const url_multi = item.asciidoc.attributes['cloud-url-video'] ? item.asciidoc.attributes['cloud-url-video'].split('|')[index] : item.pub.url
-                        addEntity({
-                            title: title_multi ?? item.title,
-                            url: url_multi + (!!anchor_multi ? `#${anchor_multi.trim()}` : ''),
-                            tags: tags_multi,
-                            type,
-                            order: order_multi ?? 0
-                        })
-                    })
-                } else {
-                    addEntity({
-                        title,
-                        url,
-                        tags,
-                        type,
-                        order
-                    })
-                }
-            }
-        })
-    })
-        .on('beforePublish', ({siteCatalog}) => {
-            siteCatalog.addFile({
-                contents: Buffer.from(JSON.stringify({
-                    tags: config.tags ?? [],
-                    links: content.sort((a, b) => a.order - b.order)
-                })),
-                out: {path: config.path ?? 'api/cloud.json'}
-            })
-        })
-}
diff --git a/package-lock.json b/package-lock.json
index f2705618..824ec949 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@algolia/client-search": "^5.49.2",
         "@antora/pdf-extension": "^1.0.0-alpha.1",
-        "hazelcast-docs-tools": "github:hazelcast/hazelcast-docs-tools#semver:2.4.1"
+        "hazelcast-docs-tools": "github:hazelcast/hazelcast-docs-tools#semver:2.5.0"
       },
       "devDependencies": {
         "@antora/cli": "^3.1.1",
diff --git a/package.json b/package.json
index 773d3c32..6eaaf5b7 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,6 @@
   "dependencies": {
     "@algolia/client-search": "^5.49.2",
     "@antora/pdf-extension": "^1.0.0-alpha.1",
-    "hazelcast-docs-tools": "github:hazelcast/hazelcast-docs-tools#semver:2.4.1"
+    "hazelcast-docs-tools": "github:hazelcast/hazelcast-docs-tools#semver:2.5.0"
   }
 }