diff --git a/extensions/algolia-indexer/generate-index.js b/extensions/algolia-indexer/generate-index.js
index 86a3dcb..f1dc809 100644
--- a/extensions/algolia-indexer/generate-index.js
+++ b/extensions/algolia-indexer/generate-index.js
@@ -203,7 +203,7 @@ function generateIndex (playbook, contentCatalog, { indexLatestOnly = false, exc
       indexItem.deployment = deployment;
       indexItem.type = 'Lab';
       indexItem.interactive = false;
-      indexItem._tags = ['labs'];
+      indexItem._tags = [tag];
     }
     algolia[cname][version].push(indexItem)
     algoliaCount++
diff --git a/extensions/find-related-labs.js b/extensions/find-related-labs.js
index 209161d..cf97908 100644
--- a/extensions/find-related-labs.js
+++ b/extensions/find-related-labs.js
@@ -4,7 +4,7 @@ module.exports.register = function ({ config }) {
   const logger = this.getLogger('related-labs-extension');
 
   this.on('documentsConverted', async ({ contentCatalog, siteCatalog }) => {
-    const docs = contentCatalog.findBy({ component: 'ROOT', family: 'page' });
+    const docs = contentCatalog.findBy({ family: 'page' });
     docs.forEach((docPage) => {
       const relatedLabs = []
       const sourceAttributes = docPage.asciidoc.attributes
@@ -31,7 +31,7 @@ function findRelated(labPage, sourceCategoryList, sourceDeploymentType, logger)
   const targetCategoryList = pageCategories.split(',').map(c => c.trim());
   const targetDeploymentType = getDeploymentType(targetAttributes)
   const categoryMatch = hasMatchingCategory(sourceCategoryList, targetCategoryList)
-  if (categoryMatch && (!targetDeploymentType ||sourceDeploymentType === targetDeploymentType || targetDeploymentType === 'Docker')) {
+  if (categoryMatch && (!targetDeploymentType ||sourceDeploymentType === targetDeploymentType || (targetDeploymentType === 'Docker' && !sourceDeploymentType))) {
     return {
       title: labPage.asciidoc.doctitle,
       url: labPage.pub.url,
@@ -45,7 +45,8 @@ function getDeploymentType (attributes) {
   return attributes['env-kubernetes'] ? 'Kubernetes'
     : attributes['env-linux'] ? 'Linux'
       : attributes['env-docker'] ? 'Docker'
-        : attributes.cloud ? 'Redpanda Cloud' : ''
+        : attributes['env-cloud'] ? 'Redpanda Cloud'
+          : attributes['page-cloud'] ? 'Redpanda Cloud' : ''
 }
 
 function hasMatchingCategory (sourcePageCategories, targetPageCategories) {
diff --git a/package-lock.json b/package-lock.json
index b6da65f..63a03ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@redpanda-data/docs-extensions-and-macros",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@redpanda-data/docs-extensions-and-macros",
-      "version": "3.5.7",
+      "version": "3.5.8",
       "license": "ISC",
       "dependencies": {
         "@octokit/plugin-retry": "~4.1.3",
diff --git a/package.json b/package.json
index fa26d2f..2d74373 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redpanda-data/docs-extensions-and-macros",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "description": "Antora extensions and macros developed for Redpanda documentation.",
   "keywords": [
     "antora",