diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2b2331666cc..2e634a21054 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -54,6 +54,23 @@ title: Timeturner
 # - server-app is for applications usually installed on the server-side.
 category: os
 
+# Tags of the product (optional).
+#
+# Tags :
+# - must match [a-z0-9\-]+,
+# - must be declared with a space-separated string,
+# - must be alphabetically ordered,
+# - must use singular (for example web-server, not web-servers),
+# - should be used at least twice,
+# - must be added for one of the following reasons :
+#   - set a product family such as linux-distribution, web-browser, mobile-phone or web-server,
+#   - set a product vendor such as adobe, amazon or apache,
+#   - set a runtime dependency such as java-runtime, javascript-runtime or php-runtime.
+#
+# Remember that no tag is better than useless tag. Also note that categories are automatically tags, but don't
+# use another category as a tag.
+tags: amazon linux
+
 # Simple Icons (https://simpleicons.org/) icon slug (optional).
 # Remove this property if the icon is not available on Simple Icons.
 # As an example, https://simpleicons.org/?q=codemagic links to https://simpleicons.org/icons/codemagic.svg ,
diff --git a/_auto/validate.py b/_auto/validate.py
index 65886d69051..e017c9dd179 100644
--- a/_auto/validate.py
+++ b/_auto/validate.py
@@ -1,3 +1,5 @@
+import re
+
 import sys
 import frontmatter
 from datetime import date
@@ -35,6 +37,8 @@ def load_product_data(file):
 def assert_that_in(values, value, name, file):
     assert value in values, f"{name} '{value}' is not valid in {file}, it must be in {values}"
 
+def assert_that_match(regex, value, name, file):
+    assert bool(re.fullmatch(regex, value)), f"{name} '{value}' does not match {regex} in {file}"
 
 def assert_not_blank(value, name, file):
     assert value.strip(), f"{name} must not be blank in {file}"
@@ -56,6 +60,9 @@ def validate_product(file):
     assert_that_in(VALID_CATEGORIES, data['category'], 'category', file)
     assert_that_starts_with('/', data['permalink'], 'permalink', file)
 
+    if "tags" in data:
+        assert_that_match("^[a-z0-9\-]+( [a-z0-9\-]+)*", data['tags'], 'tags', file)
+
     if "alternate_urls" in data:
         for url in data["alternate_urls"]:
             assert_that_starts_with('/', url, 'alternate_url', file)
diff --git a/_plugins/product-data-enricher.rb b/_plugins/product-data-enricher.rb
index 30f8a110afa..98ac3f5b668 100644
--- a/_plugins/product-data-enricher.rb
+++ b/_plugins/product-data-enricher.rb
@@ -58,7 +58,7 @@ def set_tags(page)
         end
 
         tags << page.data['category']
-        page.data['tags'] = tags
+        page.data['tags'] = tags.sort
       end
 
       # Set properly the column presence/label if it was overridden.
diff --git a/products/alibaba-dragonwell.md b/products/alibaba-dragonwell.md
index 6c4783314a7..4eb174f71fd 100644
--- a/products/alibaba-dragonwell.md
+++ b/products/alibaba-dragonwell.md
@@ -1,6 +1,7 @@
 ---
 title: Alibaba Dragonwell
 category: lang
+tags: alibaba java-distribution
 iconSlug: openjdk
 permalink: /alibaba-dragonwell
 
diff --git a/products/almalinux.md b/products/almalinux.md
index 4a0aaaa23cb..e03250bbf1b 100644
--- a/products/almalinux.md
+++ b/products/almalinux.md
@@ -1,6 +1,7 @@
 ---
 title: AlmaLinux OS
 category: os
+tags: linux-distribution
 permalink: /almalinux
 versionCommand: cat /etc/redhat-release
 releasePolicyLink: https://blog.cloudlinux.com/announcing-open-sourced-community-driven-rhel-fork-by-cloudlinux
diff --git a/products/alpinelinux.md b/products/alpinelinux.md
index dfc1fbe8ecd..e16cc21ed85 100644
--- a/products/alpinelinux.md
+++ b/products/alpinelinux.md
@@ -1,6 +1,7 @@
 ---
 title: Alpine Linux
 category: os
+tags: linux-distribution
 iconSlug: alpinelinux
 permalink: /alpine
 alternate_urls:
diff --git a/products/amazon-corretto.md b/products/amazon-corretto.md
index 1abdd25858d..505afa37fa6 100644
--- a/products/amazon-corretto.md
+++ b/products/amazon-corretto.md
@@ -1,6 +1,7 @@
 ---
 title: Amazon Corretto
 category: lang
+tags: amazon java-distribution
 iconSlug: openjdk
 permalink: /amazon-corretto
 alternate_urls:
diff --git a/products/amazon-linux.md b/products/amazon-linux.md
index 53bd1874d1f..5c7200475be 100644
--- a/products/amazon-linux.md
+++ b/products/amazon-linux.md
@@ -1,6 +1,7 @@
 ---
 title: Amazon Linux
 category: os
+tags: amazon linux-distribution
 iconSlug: amazonaws
 permalink: /amazon-linux
 versionCommand: cat /etc/system-release
@@ -189,9 +190,9 @@ AWS announced [Amazon Linux 2023][al2023] [^1] as a successor to
 Amazon Linux 2, which uses Fedora as the upstream. It reached
 GA (General Availability) in March 2023.
 
-Every major version release is supported by Standard Support for 2 years, 
+Every major version release is supported by Standard Support for 2 years,
 followed by a maintenance phase of 3 years. Quarterly minor releases will be made
-during the Standard Support phase and include security updates, 
+during the Standard Support phase and include security updates,
 bug fixes, and new features and packages. Minor releases do not
 break backward-compatibility.
 
diff --git a/products/amazon-rds-mysql.md b/products/amazon-rds-mysql.md
index 26633e20d05..e630dd52bd9 100644
--- a/products/amazon-rds-mysql.md
+++ b/products/amazon-rds-mysql.md
@@ -1,6 +1,7 @@
 ---
 title: Amazon RDS for MySQL
 category: service
+tags: amazon managed-mysql
 iconSlug: amazonaws
 permalink: /amazon-rds-mysql
 releasePolicyLink: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/MySQL.Concepts.VersionMgmt.html
diff --git a/products/amazon-rds-postgresql.md b/products/amazon-rds-postgresql.md
index e12c2986029..0c39d7e94ea 100644
--- a/products/amazon-rds-postgresql.md
+++ b/products/amazon-rds-postgresql.md
@@ -1,6 +1,7 @@
 ---
 title: Amazon RDS for PostgreSQL
 category: service
+tags: amazon managed-postgresql
 iconSlug: amazonaws
 permalink: /amazon-rds-postgresql
 releasePolicyLink: https://docs.aws.amazon.com/AmazonRDS/latest/PostgreSQLReleaseNotes/postgresql-release-calendar.html
diff --git a/products/android.md b/products/android.md
index d3dd9a54c37..b7c627fb002 100644
--- a/products/android.md
+++ b/products/android.md
@@ -1,6 +1,7 @@
 ---
 title: Android OS
 category: os
+tags: google
 iconSlug: android
 permalink: /android
 alternate_urls:
diff --git a/products/angular.md b/products/angular.md
index 33f3afb2377..65eb5c90b37 100644
--- a/products/angular.md
+++ b/products/angular.md
@@ -1,6 +1,7 @@
 ---
 title: Angular
 category: framework
+tags: google javascript-runtime
 iconSlug: angular
 permalink: /angular
 versionCommand: ng version
diff --git a/products/ansible-core.md b/products/ansible-core.md
index 7e3f35e2ebe..4bb47d2a7e3 100644
--- a/products/ansible-core.md
+++ b/products/ansible-core.md
@@ -10,6 +10,7 @@ activeSupportColumn: false
 eolColumn: Supported
 iconSlug: ansible
 category: framework
+tags: python-runtime red-hat
 auto:
 -   git: https://github.com/ansible/ansible.git
 releases:
diff --git a/products/ansible.md b/products/ansible.md
index 0b40677fd06..3fe79cc7523 100644
--- a/products/ansible.md
+++ b/products/ansible.md
@@ -1,6 +1,7 @@
 ---
 title: Ansible
 category: app
+tags: python-runtime red-hat
 iconSlug: ansible
 permalink: /ansible
 # The following command works from Ansible 6.0.0 on:
diff --git a/products/antixlinux.md b/products/antixlinux.md
index 52dc6d41e6b..2fdd2949afc 100644
--- a/products/antixlinux.md
+++ b/products/antixlinux.md
@@ -1,6 +1,7 @@
 ---
 title: antiX Linux
 category: os
+tags: linux-distribution
 permalink: /antix
 alternate_urls:
 -   /antixlinux
diff --git a/products/apache-airflow.md b/products/apache-airflow.md
index 11165ac3621..ccf1a0e2992 100644
--- a/products/apache-airflow.md
+++ b/products/apache-airflow.md
@@ -8,6 +8,7 @@ releasePolicyLink: https://github.com/apache/airflow#version-life-cycle
 changelogTemplate: https://airflow.apache.org/docs/apache-airflow/stable/release_notes.html#airflow-{{"__LATEST__"
   | replace:'.','-'}}-{{"__LATEST_RELEASE_DATE__"}}
 category: framework
+tags: apache python-runtime
 activeSupportColumn: false
 versionCommand: airflow version
 releaseColumn: true
diff --git a/products/apache-camel.md b/products/apache-camel.md
index 886af24c76a..9d9c12e921d 100644
--- a/products/apache-camel.md
+++ b/products/apache-camel.md
@@ -1,10 +1,11 @@
 ---
 title: Apache Camel
+category: framework
+tags: apache java-runtime
 permalink: /apache-camel
 alternate_urls:
 -   /camel
 -   /camel-lang
-category: framework
 releasePolicyLink: https://camel.apache.org/blog/2020/03/LTS-Release-Schedule/
 changelogTemplate: https://camel.apache.org/releases/release-__LATEST__/
 releaseColumn: true
diff --git a/products/apache-cassandra.md b/products/apache-cassandra.md
index 38d9cad1a21..e0e360a9467 100644
--- a/products/apache-cassandra.md
+++ b/products/apache-cassandra.md
@@ -7,6 +7,7 @@ iconSlug: apachecassandra
 releaseDateColumn: true
 changelogTemplate: 'https://gitbox.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=NEWS.txt;hb=refs/tags/cassandra-__LATEST__'
 category: db
+tags: apache java-runtime
 releasePolicyLink: https://cassandra.apache.org/_/blog/Behind-the-scenes-of-an-Apache-Cassandra-Release.html
 auto:
 -   git: https://github.com/apache/cassandra.git
diff --git a/products/apache-groovy.md b/products/apache-groovy.md
index 55948e20789..95429b94ebb 100644
--- a/products/apache-groovy.md
+++ b/products/apache-groovy.md
@@ -5,6 +5,7 @@ alternate_urls:
 -   /groovy
 -   /groovy-lang
 category: lang
+tags: apache java-runtime
 iconSlug: apachegroovy
 releasePolicyLink: https://groovy.apache.org/versioning.html
 changelogTemplate: https://groovy-lang.org/changelogs/changelog-__LATEST__.html
diff --git a/products/apache-http-server.md b/products/apache-http-server.md
index b897da98e61..c899d7c0a47 100644
--- a/products/apache-http-server.md
+++ b/products/apache-http-server.md
@@ -1,6 +1,7 @@
 ---
 title: Apache HTTP Server
 category: server-app
+tags: apache web-server
 iconSlug: apache
 permalink: /apache
 alternate_urls:
diff --git a/products/apache-maven.md b/products/apache-maven.md
index b9928d839a9..4c6350fc6fd 100644
--- a/products/apache-maven.md
+++ b/products/apache-maven.md
@@ -1,6 +1,7 @@
 ---
 title: Apache Maven
 category: app
+tags: apache java-runtime
 versionCommand: mvn --version
 permalink: /maven
 alternate_urls:
diff --git a/products/api-platform.md b/products/api-platform.md
index 7b1af3f8e55..c7448b06b2a 100644
--- a/products/api-platform.md
+++ b/products/api-platform.md
@@ -1,6 +1,7 @@
 ---
 title: API Platform
 category: framework
+tags: php-runtime
 permalink: /api-platform
 versionCommand: composer show api-platform/core | grep versions
 releasePolicyLink: https://api-platform.com/docs/extra/releases/
diff --git a/products/azul-zulu.md b/products/azul-zulu.md
index d8f341c6958..340c23b0680 100644
--- a/products/azul-zulu.md
+++ b/products/azul-zulu.md
@@ -1,6 +1,7 @@
 ---
 title: Azul Zulu
 category: lang
+tags: azul java-distribution
 iconSlug: openjdk
 permalink: /azul-zulu
 alternate_urls:
diff --git a/products/azure-devops.md b/products/azure-devops.md
index ad41d4156e0..bd1316ae9da 100644
--- a/products/azure-devops.md
+++ b/products/azure-devops.md
@@ -1,6 +1,7 @@
 ---
 title: Azure DevOps Server
 category: server-app
+tags: microsoft
 iconSlug: azuredevops
 permalink: /azure-devops-server
 alternate_urls:
diff --git a/products/azure-kubernetes-service.md b/products/azure-kubernetes-service.md
index fe7f8fa98ea..dcc2f240226 100644
--- a/products/azure-kubernetes-service.md
+++ b/products/azure-kubernetes-service.md
@@ -1,6 +1,7 @@
 ---
 title: Azure Kubernetes Service
 category: service
+tags: managed-kubernetes microsoft
 iconSlug: microsoftazure
 permalink: /azure-kubernetes-service
 alternate_urls:
diff --git a/products/beats.md b/products/beats.md
index 826f4026926..400d53c95c5 100644
--- a/products/beats.md
+++ b/products/beats.md
@@ -1,6 +1,7 @@
 ---
 title: Elastic Beats
 category: server-app
+tags: elastic
 iconSlug: beats
 permalink: /beats
 alternate_urls:
diff --git a/products/bootstrap.md b/products/bootstrap.md
index 0b4946e68c6..66133f7ff30 100644
--- a/products/bootstrap.md
+++ b/products/bootstrap.md
@@ -1,6 +1,7 @@
 ---
 title: Bootstrap
 category: framework
+tags: css-runtime javascript-runtime
 iconSlug: bootstrap
 permalink: /bootstrap
 activeSupportColumn: true
diff --git a/products/cakephp.md b/products/cakephp.md
index 16418bdb773..e8bed1a7635 100644
--- a/products/cakephp.md
+++ b/products/cakephp.md
@@ -1,6 +1,7 @@
 ---
 title: CakePHP
 category: framework
+tags: php-runtime
 iconSlug: cakephp
 permalink: /cakephp
 alternate_urls:
diff --git a/products/centos-stream.md b/products/centos-stream.md
index b971baf2ae9..af105c8945e 100644
--- a/products/centos-stream.md
+++ b/products/centos-stream.md
@@ -1,6 +1,7 @@
 ---
 title: CentOS Stream
 category: os
+tags: linux-distribution
 iconSlug: centos
 permalink: /centos-stream
 versionCommand: cat /etc/redhat-release
diff --git a/products/centos.md b/products/centos.md
index 644ca75568a..23c6803d7a8 100644
--- a/products/centos.md
+++ b/products/centos.md
@@ -1,6 +1,7 @@
 ---
 title: CentOS
 category: os
+tags: linux-distribution
 iconSlug: centos
 permalink: /centos
 versionCommand: cat /etc/redhat-release
diff --git a/products/citrix-apps-desktops.md b/products/citrix-apps-desktops.md
index e522b60abfa..2f24a74b630 100644
--- a/products/citrix-apps-desktops.md
+++ b/products/citrix-apps-desktops.md
@@ -1,6 +1,7 @@
 ---
 title: Citrix Virtual Apps and Desktops
 category: app
+tags: citrix
 iconSlug: citrix
 permalink: /citrix-vad
 alternate_urls:
diff --git a/products/coldfusion.md b/products/coldfusion.md
index f0ec688ddc7..5a38a1124df 100644
--- a/products/coldfusion.md
+++ b/products/coldfusion.md
@@ -1,6 +1,7 @@
 ---
 title: Adobe ColdFusion
 category: server-app
+tags: adobe
 iconSlug: adobe
 permalink: /coldfusion
 versionCommand: writeoutput(server.coldfusion.productversion);
diff --git a/products/composer.md b/products/composer.md
index 82cf3806856..30725a8b743 100644
--- a/products/composer.md
+++ b/products/composer.md
@@ -1,6 +1,7 @@
 ---
 title: Composer
 category: app
+tags: php-runtime
 changelogTemplate: https://getcomposer.org/changelog/__LATEST__
 iconSlug: composer
 permalink: /composer
diff --git a/products/confluence.md b/products/confluence.md
index 441f841f2a7..fc3db9a4d16 100644
--- a/products/confluence.md
+++ b/products/confluence.md
@@ -1,6 +1,7 @@
 ---
 title: Confluence
 category: server-app
+tags: atlassian java-runtime
 iconSlug: confluence
 permalink: /confluence
 alternate_urls:
diff --git a/products/consul.md b/products/consul.md
index ce8595f7014..9f321981030 100644
--- a/products/consul.md
+++ b/products/consul.md
@@ -1,6 +1,7 @@
 ---
 title: Hashicorp Consul
 category: server-app
+tags: hashicorp
 iconSlug: consul
 permalink: /consul
 versionCommand: consul --version
diff --git a/products/cos.md b/products/cos.md
index b75ede5823d..70832c9e38b 100644
--- a/products/cos.md
+++ b/products/cos.md
@@ -1,6 +1,7 @@
 ---
 title: Google Container-Optimized OS (COS)
 category: os
+tags: google
 changelogTemplate: "https://cloud.google.com/container-optimized-os/docs/release-notes/m{{'__RELEASE_CYCLE__'|split:'-'|last}}"
 iconSlug: googlecloud
 permalink: /cos
diff --git a/products/couchbase-server.md b/products/couchbase-server.md
index e630b9ed137..fe02cec1beb 100644
--- a/products/couchbase-server.md
+++ b/products/couchbase-server.md
@@ -47,7 +47,7 @@ releases:
 
 ---
 
-> [Couchbase Server](https://www.couchbase.com/products/server) is a modern cloud-native, distributed database that fuses the strengths of relational databases such as SQL and ACID transactions with JSON flexibility and scale that defines NoSQL. It is available as a service in commercial clouds and supports hybrid and private cloud deployments. 
+> [Couchbase Server](https://www.couchbase.com/products/server) is a modern cloud-native, distributed database that fuses the strengths of relational databases such as SQL and ACID transactions with JSON flexibility and scale that defines NoSQL. It is available as a service in commercial clouds and supports hybrid and private cloud deployments.
 
 Security updates stop when a release reaches end of "Full Maintenance". Major versions are supported for the longer period between:
 
diff --git a/products/debian.md b/products/debian.md
index 6a4c593e3dd..5dee4750641 100644
--- a/products/debian.md
+++ b/products/debian.md
@@ -1,6 +1,7 @@
 ---
 title: Debian
 category: os
+tags: linux-distribution
 iconSlug: debian
 permalink: /debian
 versionCommand: cat /etc/os-release
diff --git a/products/devuan.md b/products/devuan.md
index ce6a7827812..10ecd4995e9 100644
--- a/products/devuan.md
+++ b/products/devuan.md
@@ -3,6 +3,7 @@ permalink: /devuan
 title: Devuan
 versionCommand: cat /etc/os-release
 category: os
+tags: linux-distribution
 releasePolicyLink: https://www.devuan.org/os/releases
 activeSupportColumn: false
 releaseColumn: true
diff --git a/products/django.md b/products/django.md
index 45003e623d1..8f7f5e34da3 100644
--- a/products/django.md
+++ b/products/django.md
@@ -1,6 +1,7 @@
 ---
 title: Django
 category: framework
+tags: python-runtime
 iconSlug: django
 permalink: /django
 versionCommand: python -c "import django; print(django.get_version())"
diff --git a/products/dotnet.md b/products/dotnet.md
index 513673f7486..93cfcc1b1d7 100644
--- a/products/dotnet.md
+++ b/products/dotnet.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft .NET
 category: framework
+tags: microsoft
 iconSlug: dotnet
 permalink: /dotnet
 alternate_urls:
diff --git a/products/dotnetfx.md b/products/dotnetfx.md
index bf71bd96a9f..c66bca3bc83 100644
--- a/products/dotnetfx.md
+++ b/products/dotnetfx.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft .NET Framework
 category: framework
+tags: microsoft
 iconSlug: dotnet
 permalink: /dotnetfx
 alternative_urls:
diff --git a/products/drupal.md b/products/drupal.md
index 68b09e00640..ccadd2d42bc 100644
--- a/products/drupal.md
+++ b/products/drupal.md
@@ -1,6 +1,7 @@
 ---
 title: Drupal
 category: server-app
+tags: php-runtime
 iconSlug: drupal
 permalink: /drupal
 versionCommand: drush status
diff --git a/products/drush.md b/products/drush.md
index d13e6f51266..ad76e9f4b83 100644
--- a/products/drush.md
+++ b/products/drush.md
@@ -3,6 +3,7 @@ title: Drush
 permalink: /drush
 releasePolicyLink: https://www.drush.org/latest/install/#drupal-compatibility
 category: app
+tags: php-runtime
 changelogTemplate: https://github.com/drush-ops/drush/releases/tag/__LATEST__
 activeSupportColumn: false
 releaseDateColumn: true
diff --git a/products/eclipse-temurin.md b/products/eclipse-temurin.md
index 86275421ffe..a797e9f6860 100644
--- a/products/eclipse-temurin.md
+++ b/products/eclipse-temurin.md
@@ -1,6 +1,7 @@
 ---
 title: Eclipse Temurin
 category: lang
+tags: eclipse java-distribution
 iconSlug: openjdk
 permalink: /eclipse-temurin
 alternate_urls:
diff --git a/products/eks.md b/products/eks.md
index 5380fe5c603..545e1afb67d 100644
--- a/products/eks.md
+++ b/products/eks.md
@@ -1,6 +1,7 @@
 ---
 title: Amazon EKS
 category: service
+tags: amazon managed-kubernetes
 iconSlug: amazoneks
 permalink: /amazon-eks
 versionCommand: eksctl get cluster --name=cluster-name
diff --git a/products/elasticsearch.md b/products/elasticsearch.md
index 6aebcc8e8f5..955ac101d90 100644
--- a/products/elasticsearch.md
+++ b/products/elasticsearch.md
@@ -1,6 +1,7 @@
 ---
 title: Elasticsearch
 category: db
+tags: elastic
 iconSlug: elasticsearch
 permalink: /elasticsearch
 versionCommand: $ES_HOME/bin/elasticsearch -v
diff --git a/products/electron.md b/products/electron.md
index 322fd21d480..9c2f60dd175 100644
--- a/products/electron.md
+++ b/products/electron.md
@@ -1,6 +1,7 @@
 ---
 title: Electron
 category: framework
+tags: javascript-runtime
 iconSlug: electron
 permalink: /electron
 versionCommand: npm show electron version
diff --git a/products/emberjs.md b/products/emberjs.md
index 4ab1027a1e2..5956968a1d3 100644
--- a/products/emberjs.md
+++ b/products/emberjs.md
@@ -5,6 +5,7 @@ iconSlug: emberdotjs
 alternate_urls:
 -   /ember
 category: framework
+tags: javascript-runtime
 releasePolicyLink: https://emberjs.com/releases/
 changelogTemplate: https://github.com/emberjs/ember.js/releases/tag/v__LATEST__
 activeSupportColumn: true
diff --git a/products/eurolinux.md b/products/eurolinux.md
index 9a8b5dcf63f..36ccffbafa1 100644
--- a/products/eurolinux.md
+++ b/products/eurolinux.md
@@ -2,6 +2,7 @@
 permalink: /eurolinux
 title: EuroLinux
 category: os
+tags: linux-distribution
 versionCommand: lsb_release --release
 releasePolicyLink: https://euro-linux.com/eurolinux/technical-specifications/
 activeSupportColumn: true
diff --git a/products/fairphone.md b/products/fairphone.md
index edc41d0b017..b0226c74fca 100644
--- a/products/fairphone.md
+++ b/products/fairphone.md
@@ -2,6 +2,7 @@
 permalink: /fairphone
 title: Fairphone
 category: device
+tags: mobile-phone
 releasePolicyLink: https://forum.fairphone.com/t/fairphone-product-release-cycle/52652
 discontinuedColumn: true
 activeSupportColumn: false
diff --git a/products/fedora.md b/products/fedora.md
index 59483fa0927..cabfd446b7d 100644
--- a/products/fedora.md
+++ b/products/fedora.md
@@ -1,6 +1,7 @@
 ---
 title: Fedora Linux
 category: os
+tags: linux-distribution
 iconSlug: fedora
 permalink: /fedora
 versionCommand: cat /etc/fedora-release
diff --git a/products/firefox.md b/products/firefox.md
index f73fac1a6d4..4c2c032e6b9 100644
--- a/products/firefox.md
+++ b/products/firefox.md
@@ -1,6 +1,7 @@
 ---
 title: Firefox
 category: app
+tags: mozilla web-browser
 iconSlug: firefoxbrowser
 permalink: /firefox
 releasePolicyLink: https://www.mozilla.org/firefox/
diff --git a/products/fortios.md b/products/fortios.md
index c284f3fd37e..5071c34fe32 100644
--- a/products/fortios.md
+++ b/products/fortios.md
@@ -1,6 +1,7 @@
 ---
 title: FortiOS
 category: os
+tags: fortinet
 alternate_urls:
 -   /fortinet
 iconSlug: fortinet
diff --git a/products/freebsd.md b/products/freebsd.md
index db7034b3074..875de7eef99 100644
--- a/products/freebsd.md
+++ b/products/freebsd.md
@@ -1,6 +1,7 @@
 ---
 title: FreeBSD
 category: os
+tags: bsd-distribution
 iconSlug: freebsd
 permalink: /freebsd
 versionCommand: freebsd-version
diff --git a/products/gitlab.md b/products/gitlab.md
index 3f9f1f8bd31..4dad913d205 100644
--- a/products/gitlab.md
+++ b/products/gitlab.md
@@ -1,6 +1,7 @@
 ---
 title: GitLab
 category: server-app
+tags: gitlab
 iconSlug: gitlab
 permalink: /gitlab
 versionCommand: gitlab-rake gitlab:env:info
diff --git a/products/gke.md b/products/gke.md
index b110846cba7..3a724d98e51 100644
--- a/products/gke.md
+++ b/products/gke.md
@@ -1,6 +1,7 @@
 ---
 title: Google Kubernetes Engine
 category: service
+tags: google managed-kubernetes
 iconSlug: kubernetes
 permalink: /google-kubernetes-engine
 alternate_urls:
diff --git a/products/go.md b/products/go.md
index ccc3b275fb1..fa69f76ff6d 100644
--- a/products/go.md
+++ b/products/go.md
@@ -1,6 +1,7 @@
 ---
 title: Go
 category: lang
+tags: google
 iconSlug: go
 permalink: /go
 alternate_urls:
diff --git a/products/graalvm.md b/products/graalvm.md
index e5a77b45620..52c4c05a87d 100644
--- a/products/graalvm.md
+++ b/products/graalvm.md
@@ -1,6 +1,7 @@
 ---
 title: GraalVM
 category: lang
+tags: java-distribution oracle
 permalink: /graalvm
 releasePolicyLink: https://www.graalvm.org/release-notes/release-calendar/
 changelogTemplate: "https://www.graalvm.org/latest/release-notes/{{ '__RELEASE_CYCLE__' | replace:'.','_' }}/"
diff --git a/products/gradle.md b/products/gradle.md
index 386f24035c4..afa3b099d50 100644
--- a/products/gradle.md
+++ b/products/gradle.md
@@ -1,6 +1,7 @@
 ---
 title: Gradle
 category: app
+tags: java-runtime
 iconSlug: gradle
 permalink: /gradle
 versionCommand: gradle --version
diff --git a/products/grails.md b/products/grails.md
index 2c7dd8b012f..3e8659f9d3f 100644
--- a/products/grails.md
+++ b/products/grails.md
@@ -1,6 +1,7 @@
 ---
 title: Grails Framework
 category: framework
+tags: java-runtime
 permalink: /grails
 alternate_urls:
 -   /grails-framework
diff --git a/products/haproxy.md b/products/haproxy.md
index aee313ad73e..d6207eaa93c 100644
--- a/products/haproxy.md
+++ b/products/haproxy.md
@@ -1,6 +1,7 @@
 ---
 title: HAProxy
 category: server-app
+tags: web-server
 permalink: /haproxy
 versionCommand: haproxy -v
 releasePolicyLink: https://www.haproxy.org/
diff --git a/products/hashicorp-vault.md b/products/hashicorp-vault.md
index d896dadb3ea..f8552bf9b04 100644
--- a/products/hashicorp-vault.md
+++ b/products/hashicorp-vault.md
@@ -1,6 +1,7 @@
 ---
 title: Hashicorp Vault
 category: server-app
+tags: hashicorp
 iconSlug: vault
 permalink: /hashicorp-vault
 alternate_urls:
diff --git a/products/hbase.md b/products/hbase.md
index 214348e1d53..dfb0926303b 100644
--- a/products/hbase.md
+++ b/products/hbase.md
@@ -1,6 +1,7 @@
 ---
 title: Apache HBase
 category: server-app
+tags: apache java-runtime
 permalink: /hbase
 alternate_urls:
 -   /apache_hbase
diff --git a/products/internetexplorer.md b/products/internetexplorer.md
index 5eac9e1e0fa..9a78d282f64 100644
--- a/products/internetexplorer.md
+++ b/products/internetexplorer.md
@@ -1,6 +1,7 @@
 ---
 title: Internet Explorer
 category: app
+tags: microsoft web-browser
 iconSlug: internetexplorer
 permalink: /internet-explorer
 alternate_urls:
diff --git a/products/ionic.md b/products/ionic.md
index b907b7016fc..3941892027e 100644
--- a/products/ionic.md
+++ b/products/ionic.md
@@ -1,6 +1,7 @@
 ---
 title: Ionic Framework
 category: framework
+tags: javascript-runtime
 iconSlug: ionic
 permalink: /ionic
 alternate_urls:
diff --git a/products/ios.md b/products/ios.md
index c72330e8d03..17aff08d19e 100644
--- a/products/ios.md
+++ b/products/ios.md
@@ -1,6 +1,7 @@
 ---
 title: Apple iOS
 category: os
+tags: apple
 iconSlug: apple
 permalink: /ios
 releasePolicyLink: https://en.wikipedia.org/wiki/IOS_version_history#Overview
diff --git a/products/ipad.md b/products/ipad.md
index 6c2bc063f97..19fce1f93ff 100644
--- a/products/ipad.md
+++ b/products/ipad.md
@@ -1,6 +1,7 @@
 ---
 title: Apple iPad
 category: device
+tags: apple tablet
 iconSlug: apple
 permalink: /ipad
 releasePolicyLink: https://en.wikipedia.org/wiki/List_of_iOS,_iPadOS,_tvOS,_and_watchOS_devices#iPad_(lineup)
diff --git a/products/ipados.md b/products/ipados.md
index b79f642cebc..88214dff330 100644
--- a/products/ipados.md
+++ b/products/ipados.md
@@ -1,6 +1,7 @@
 ---
 title: Apple iPadOS
 category: os
+tags: apple
 iconSlug: apple
 permalink: /ipados
 releasePolicyLink: https://en.wikipedia.org/wiki/IOS_version_history#Overview
diff --git a/products/iphone.md b/products/iphone.md
index caa538a39bf..dd16e80f148 100644
--- a/products/iphone.md
+++ b/products/iphone.md
@@ -1,6 +1,7 @@
 ---
 title: Apple iPhone
 category: device
+tags: apple mobile-phone
 iconSlug: apple
 permalink: /iphone
 releasePolicyLink: https://wikipedia.org/wiki/List_of_iOS_and_iPadOS_devices#In_production_and_supported
diff --git a/products/java.md b/products/java.md
index 86b85d8241e..7f3abb05bcd 100644
--- a/products/java.md
+++ b/products/java.md
@@ -1,6 +1,7 @@
 ---
 title: Java/OpenJDK
 category: lang
+tags: java-distribution oracle
 iconSlug: openjdk
 permalink: /java
 alternate_urls:
diff --git a/products/jekyll.md b/products/jekyll.md
index f02faf0259e..bab67c298ba 100644
--- a/products/jekyll.md
+++ b/products/jekyll.md
@@ -1,6 +1,7 @@
 ---
 title: Jekyll
 category: app
+tags: ruby-runtime
 iconSlug: jekyll
 permalink: /jekyll
 releasePolicyLink: https://jekyllrb.com/docs/security/
diff --git a/products/jenkins.md b/products/jenkins.md
index 261752b870f..6acacb6a12f 100644
--- a/products/jenkins.md
+++ b/products/jenkins.md
@@ -1,6 +1,7 @@
 ---
 title: Jenkins
 category: server-app
+tags: java-runtime
 iconSlug: jenkins
 permalink: /jenkins
 releasePolicyLink: https://www.jenkins.io/download/lts/
diff --git a/products/jhipster.md b/products/jhipster.md
index 84c866aba18..844d3b90fbc 100644
--- a/products/jhipster.md
+++ b/products/jhipster.md
@@ -1,6 +1,7 @@
 ---
 title: JHipster
 category: app
+tags: java-runtime javascript-runtime
 permalink: /jhipster
 versionCommand: yo jhipster
 releasePolicyLink: https://www.jhipster.tech/releases/
diff --git a/products/jira.md b/products/jira.md
index f03122c8ccd..19a96dc3f25 100644
--- a/products/jira.md
+++ b/products/jira.md
@@ -1,6 +1,7 @@
 ---
 title: Jira Software
 category: server-app
+tags: atlassian java-runtime
 iconSlug: jirasoftware
 permalink: /jira-software
 alternate_urls:
diff --git a/products/joomla.md b/products/joomla.md
index 9d6f9908c94..c0c3d62bf18 100644
--- a/products/joomla.md
+++ b/products/joomla.md
@@ -1,6 +1,7 @@
 ---
 title: Joomla!
 category: server-app
+tags: php-runtime
 iconSlug: joomla
 permalink: /joomla
 releasePolicyLink: https://docs.joomla.org/Release_and_support_cycle
diff --git a/products/jquery.md b/products/jquery.md
index 7d6e07d9fa9..180e274ff41 100644
--- a/products/jquery.md
+++ b/products/jquery.md
@@ -1,6 +1,7 @@
 ---
 title: jQuery
 category: framework
+tags: javascript-runtime
 iconSlug: jquery
 permalink: /jquery
 changelogTemplate: "https://github.com/jquery/jquery/releases/tag/__LATEST__"
diff --git a/products/jreleaser.md b/products/jreleaser.md
index 2c251c827e9..47eed8973f0 100644
--- a/products/jreleaser.md
+++ b/products/jreleaser.md
@@ -1,6 +1,7 @@
 ---
 title: JReleaser
 category: app
+tags: java-runtime
 permalink: /jreleaser
 versionCommand: jreleaser --version
 releasePolicyLink: https://jreleaser.org/guide/latest/release-history.html
diff --git a/products/keycloak.md b/products/keycloak.md
index 0b05a28c71a..bbe11fcb993 100644
--- a/products/keycloak.md
+++ b/products/keycloak.md
@@ -1,6 +1,7 @@
 ---
 title: Keycloak
 category: server-app
+tags: java-runtime red-hat
 # https://github.com/simple-icons/simple-icons/issues/8125
 permalink: /keycloak
 releasePolicyLink: https://github.com/keycloak/keycloak/security/policy#supported-versions
diff --git a/products/kibana.md b/products/kibana.md
index 9a3440334e9..4ddf534e3d6 100644
--- a/products/kibana.md
+++ b/products/kibana.md
@@ -1,6 +1,7 @@
 ---
 title: Kibana
 category: server-app
+tags: elastic
 iconSlug: kibana
 permalink: /kibana
 releasePolicyLink: https://www.elastic.co/support_policy
diff --git a/products/kindle.md b/products/kindle.md
index bf5dfc4e64e..faf998651c9 100644
--- a/products/kindle.md
+++ b/products/kindle.md
@@ -1,6 +1,7 @@
 ---
 title: Amazon Kindle
 category: device
+tags: amazon e-reader
 iconSlug: amazon
 permalink: /kindle
 alternate_urls:
diff --git a/products/kotlin.md b/products/kotlin.md
index fb70856131b..4b79968b44f 100644
--- a/products/kotlin.md
+++ b/products/kotlin.md
@@ -1,6 +1,7 @@
 ---
 title: Kotlin
 category: lang
+tags: jetbrains
 iconSlug: kotlin
 permalink: /kotlin
 alternate_urls:
diff --git a/products/laravel.md b/products/laravel.md
index 0f232a3da42..69d5c208b74 100644
--- a/products/laravel.md
+++ b/products/laravel.md
@@ -1,6 +1,7 @@
 ---
 title: Laravel
 category: framework
+tags: php-runtime
 iconSlug: laravel
 permalink: /laravel
 versionCommand: composer show laravel/framework|grep versions
diff --git a/products/linuxmint.md b/products/linuxmint.md
index 6d571101d2b..3b8e0095ee9 100644
--- a/products/linuxmint.md
+++ b/products/linuxmint.md
@@ -3,6 +3,7 @@ permalink: /linuxmint
 title: Linux Mint
 versionCommand: cat /etc/linuxmint/info
 category: os
+tags: linux-distribution
 releasePolicyLink: https://linuxmint.com/download_all.php
 activeSupportColumn: true
 releaseDateColumn: true
diff --git a/products/log4j.md b/products/log4j.md
index 384136bb276..37bbc84f38b 100644
--- a/products/log4j.md
+++ b/products/log4j.md
@@ -1,6 +1,7 @@
 ---
 title: Apache Log4j
 category: framework
+tags: java-runtime
 iconSlug: apache
 permalink: /log4j
 alternate_urls:
diff --git a/products/logstash.md b/products/logstash.md
index dd0a9f0aacb..33787a751da 100644
--- a/products/logstash.md
+++ b/products/logstash.md
@@ -1,6 +1,7 @@
 ---
 title: Logstash
 category: server-app
+tags: elastic
 iconSlug: logstash
 permalink: /logstash
 releasePolicyLink: https://www.elastic.co/support_policy
diff --git a/products/looker.md b/products/looker.md
index b93fb360b2e..ebaeed5dd82 100644
--- a/products/looker.md
+++ b/products/looker.md
@@ -2,6 +2,7 @@
 title: Looker
 permalink: /looker
 category: server-app
+tags: google
 iconSlug: looker
 releasePolicyLink: https://cloud.google.com/looker/docs/release-overview
 changelogTemplate: |
diff --git a/products/macos.md b/products/macos.md
index 486ade63d9d..b231f4b4119 100644
--- a/products/macos.md
+++ b/products/macos.md
@@ -1,6 +1,7 @@
 ---
 title: Apple macOS
 category: os
+tags: apple
 iconSlug: macos
 permalink: /macos
 alternate_urls:
diff --git a/products/mageia.md b/products/mageia.md
index 19c5816d607..80b6334e8e6 100644
--- a/products/mageia.md
+++ b/products/mageia.md
@@ -1,6 +1,7 @@
 ---
 title: Mageia
 category: os
+tags: linux-distribution
 permalink: /mageia
 versionCommand: cat /usr/lib/os-release
 releasePolicyLink: https://www.mageia.org/support/
diff --git a/products/magento.md b/products/magento.md
index 74769019889..7c0eed46d97 100644
--- a/products/magento.md
+++ b/products/magento.md
@@ -1,6 +1,7 @@
 ---
 title: Magento
 category: server-app
+tags: php-runtime
 iconSlug: magento
 permalink: /magento
 alternate_urls:
diff --git a/products/mastodon.md b/products/mastodon.md
index f08f3f25c80..f9eb03d24e9 100644
--- a/products/mastodon.md
+++ b/products/mastodon.md
@@ -1,6 +1,7 @@
 ---
 title: Mastodon
 category: server-app
+tags: javascript-runtime ruby-runtime
 iconSlug: mastodon
 permalink: /mastodon
 releasePolicyLink: https://github.com/mastodon/mastodon/security/policy
diff --git a/products/mediawiki.md b/products/mediawiki.md
index cd23761de50..4027d0acfe8 100644
--- a/products/mediawiki.md
+++ b/products/mediawiki.md
@@ -1,6 +1,7 @@
 ---
 title: MediaWiki
 category: server-app
+tags: php-runtime
 changelogTemplate: "https://www.mediawiki.org/wiki/Release_notes/__RELEASE_CYCLE__"
 releaseImage: https://upload.wikimedia.org/wikipedia/mediawiki/timeline/of9ibgdvah78ld94hnu3ob5qeiwy4em.png
 permalink: /mediawiki
diff --git a/products/micronaut.md b/products/micronaut.md
index 3b8acff5250..3aad5e06c78 100644
--- a/products/micronaut.md
+++ b/products/micronaut.md
@@ -1,6 +1,7 @@
 ---
 title: Micronaut Framework
 category: framework
+tags: java-runtime
 permalink: /micronaut
 alternate_urls:
 -   /micronaut-framework
diff --git a/products/microsoft-build-of-openjdk.md b/products/microsoft-build-of-openjdk.md
index ded5c11d97a..016aef28341 100644
--- a/products/microsoft-build-of-openjdk.md
+++ b/products/microsoft-build-of-openjdk.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Build of OpenJDK
 category: lang
+tags: java-distribution microsoft
 iconSlug: openjdk
 permalink: /microsoft-build-of-openjdk
 versionCommand: java -version
diff --git a/products/moodle.md b/products/moodle.md
index e776f368c5b..e138100abb0 100644
--- a/products/moodle.md
+++ b/products/moodle.md
@@ -1,6 +1,7 @@
 ---
 title: Moodle
 category: server-app
+tags: php-runtime
 permalink: /moodle
 releasePolicyLink: https://moodledev.io/general/releases
 changelogTemplate: "https://moodledev.io/general/releases/__RELEASE_CYCLE__/__LATEST__"
diff --git a/products/msexchange.md b/products/msexchange.md
index cb6000cf756..0fc6ecd8c03 100644
--- a/products/msexchange.md
+++ b/products/msexchange.md
@@ -3,6 +3,7 @@ title: Microsoft Exchange
 permalink: /msexchange
 iconSlug: microsoftexchange
 category: server-app
+tags: microsoft
 releasePolicyLink: https://learn.microsoft.com/lifecycle/products/?terms=Exchange%20Server
 activeSupportColumn: true
 versionCommand: Get-ExchangeServer | Format-List Name,Edition,AdminDisplayVersion
diff --git a/products/mssharepoint.md b/products/mssharepoint.md
index f9f675d69aa..feb38c46cdf 100644
--- a/products/mssharepoint.md
+++ b/products/mssharepoint.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft SharePoint
 category: server-app
+tags: microsoft
 iconSlug: microsoftsharepoint
 permalink: /sharepoint
 alternate_urls:
diff --git a/products/mssqlserver.md b/products/mssqlserver.md
index a64017e540e..0563520ac8c 100644
--- a/products/mssqlserver.md
+++ b/products/mssqlserver.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft SQL Server
 category: db
+tags: microsoft
 iconSlug: microsoftsqlserver
 permalink: /mssqlserver
 alternate_urls:
diff --git a/products/muleruntime.md b/products/muleruntime.md
index 41c32058a07..b3385e7fdb3 100644
--- a/products/muleruntime.md
+++ b/products/muleruntime.md
@@ -1,6 +1,7 @@
 ---
 title: Mule Runtime
 category: server-app
+tags: java-runtime
 iconSlug: mulesoft
 permalink: /mulesoft-runtime
 alternate_urls:
diff --git a/products/mxlinux.md b/products/mxlinux.md
index ef7fe78a715..8d84a1dae93 100644
--- a/products/mxlinux.md
+++ b/products/mxlinux.md
@@ -1,6 +1,7 @@
 ---
 title: MX Linux
 category: os
+tags: linux-distribution
 iconSlug: mxlinux
 permalink: /mxlinux
 alternate_urls:
diff --git a/products/mysql.md b/products/mysql.md
index 49872b9c763..2702b14634b 100644
--- a/products/mysql.md
+++ b/products/mysql.md
@@ -1,6 +1,7 @@
 ---
 title: MySQL
 category: db
+tags: oracle
 iconSlug: mysql
 permalink: /mysql
 versionCommand: mysqld --version
diff --git a/products/neo4j.md b/products/neo4j.md
index 5e77b7574e6..d23093f25fa 100644
--- a/products/neo4j.md
+++ b/products/neo4j.md
@@ -1,6 +1,7 @@
 ---
 title: Neo4j
 category: db
+tags: java-runtime
 iconSlug: neo4j
 permalink: /neo4j
 versionCommand: "call dbms.components() yield versions unwind versions as version\
diff --git a/products/netbsd.md b/products/netbsd.md
index 5b4453dc4bd..3a457ba31c6 100644
--- a/products/netbsd.md
+++ b/products/netbsd.md
@@ -1,6 +1,7 @@
 ---
 title: NetBSD
 category: os
+tags: bsd-distribution
 iconSlug: netbsd
 permalink: /netbsd
 versionCommand: uname -r
diff --git a/products/nextcloud.md b/products/nextcloud.md
index d2c589875c3..5f7e66ddc34 100644
--- a/products/nextcloud.md
+++ b/products/nextcloud.md
@@ -1,6 +1,7 @@
 ---
 title: Nextcloud
 category: server-app
+tags: php-runtime
 iconSlug: nextcloud
 permalink: /nextcloud
 releasePolicyLink: https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule
diff --git a/products/nexus.md b/products/nexus.md
index 40b8b4ef7d5..3b24d5f2cef 100644
--- a/products/nexus.md
+++ b/products/nexus.md
@@ -1,6 +1,7 @@
 ---
 title: Nexus Repository OSS
 category: server-app
+tags: java-runtime
 # https://github.com/simple-icons/simple-icons/issues/7924
 permalink: /nexus
 alternate_urls:
diff --git a/products/nginx.md b/products/nginx.md
index 283375133dd..065728536b3 100644
--- a/products/nginx.md
+++ b/products/nginx.md
@@ -1,6 +1,7 @@
 ---
 title: nginx
 category: server-app
+tags: web-server
 iconSlug: nginx
 permalink: /nginx
 versionCommand: nginx -v
diff --git a/products/nixos.md b/products/nixos.md
index 716899702b0..86200a821d1 100644
--- a/products/nixos.md
+++ b/products/nixos.md
@@ -1,6 +1,7 @@
 ---
 title: NixOS
 category: os
+tags: linux-distribution
 iconSlug: nixos
 permalink: /nixos
 alternate_urls:
diff --git a/products/nodejs.md b/products/nodejs.md
index cd1525793a5..e65ae31fa57 100644
--- a/products/nodejs.md
+++ b/products/nodejs.md
@@ -1,6 +1,7 @@
 ---
 title: Node.js
 category: framework
+tags: javascript-runtime
 iconSlug: nodedotjs
 permalink: /nodejs
 alternate_urls:
diff --git a/products/nokia.md b/products/nokia.md
index 655ff1eaa1a..75024c0449f 100644
--- a/products/nokia.md
+++ b/products/nokia.md
@@ -5,6 +5,7 @@ alternate_urls:
 -   /hmd
 -   /nokiamobile
 category: device
+tags: mobile-phone
 iconSlug: nokia
 releasePolicyLink: https://www.nokia.com/phones/en_int/security-updates
 activeSupportColumn: false
diff --git a/products/nomad.md b/products/nomad.md
index d5f3fc7b754..6f5d4902e2b 100644
--- a/products/nomad.md
+++ b/products/nomad.md
@@ -1,6 +1,7 @@
 ---
 title: Nomad
 category: server-app
+tags: hashicorp
 permalink: /nomad
 versionCommand: nomad --version
 releasePolicyLink: https://support.hashicorp.com/hc/articles/360021185113
diff --git a/products/numpy.md b/products/numpy.md
index 34a53ec4265..791b0ebe2b6 100644
--- a/products/numpy.md
+++ b/products/numpy.md
@@ -1,6 +1,7 @@
 ---
 title: NumPy
 category: framework
+tags: python-runtime
 iconSlug: numpy
 permalink: /numpy
 releasePolicyLink: https://numpy.org/neps/nep-0029-deprecation_policy.html
diff --git a/products/nutanix-aos.md b/products/nutanix-aos.md
index 7c3bce88b9a..bd6deda5e9b 100644
--- a/products/nutanix-aos.md
+++ b/products/nutanix-aos.md
@@ -1,6 +1,7 @@
 ---
 title: Nutanix AOS
 category: os
+tags: nutanix
 iconSlug: nutanix
 permalink: /nutanix-aos
 versionCommand: ncli cluster version
diff --git a/products/nutanix-files.md b/products/nutanix-files.md
index bdbae762786..9e39140f59d 100644
--- a/products/nutanix-files.md
+++ b/products/nutanix-files.md
@@ -1,6 +1,7 @@
 ---
 title: Nutanix Files
 category: server-app
+tags: nutanix
 iconSlug: nutanix
 permalink: /nutanix-files
 releasePolicyLink: "https://www.nutanix.com/support-services/product-support/support-policies-and-faqs"
diff --git a/products/nutanix-prism.md b/products/nutanix-prism.md
index 6b08f412b42..b2274acba13 100644
--- a/products/nutanix-prism.md
+++ b/products/nutanix-prism.md
@@ -1,6 +1,7 @@
 ---
 title: Nutanix Prism Central
 category: server-app
+tags: nutanix
 iconSlug: nutanix
 permalink: /nutanix-prism
 alternate_urls:
diff --git a/products/nuxt.md b/products/nuxt.md
index b53bb50ea01..b551d26186d 100644
--- a/products/nuxt.md
+++ b/products/nuxt.md
@@ -1,6 +1,7 @@
 ---
 title: Nuxt
 category: framework
+tags: javascript-runtime
 permalink: /nuxt
 versionCommand: npm list nuxt
 releasePolicyLink: https://nuxt.com/docs/community/roadmap
diff --git a/products/nvidiadriver.md b/products/nvidiadriver.md
index eabbf1a6724..be292da0196 100644
--- a/products/nvidiadriver.md
+++ b/products/nvidiadriver.md
@@ -3,6 +3,7 @@ releaseImage: https://docs.nvidia.com/datacenter/tesla/drivers/graphics/driver-b
 title: NVIDIA Driver
 permalink: /nvidia
 category: app
+tags: nvidia
 iconSlug: nvidia
 releasePolicyLink: https://www.nvidia.com/Download/index.aspx
 activeSupportColumn: true
@@ -11,152 +12,152 @@ releaseColumn: true
 versionCommand: nvidia-smi
 LTSLabel: "<abbr title='Long Term Support Branch'>LTSB</abbr>"
 releases:
--   releaseCycle: "R530-Windows (NFB)"
-    support: true
-    eol: 2023-06-24
-    latest: "531.79"
-    link: https://www.nvidia.com/Download/driverResults.aspx/204772/
-    releaseDate: 2023-03-23
-
--   releaseCycle: "R530-Linux (NFB)"
-    support: true
-    eol: 2023-06-24
-    latest: "530.41.03"
-    link: https://www.nvidia.com/Download/driverResults.aspx/200481/
-    releaseDate: 2023-03-23
-
--   releaseCycle: "R525-Windows (PB)"
-    support: true
-    eol: 2023-12-01
-    latest: "528.95"
-    link: https://www.nvidia.com/Download/driverResults.aspx/204574/
-    releaseDate: 2022-11-10
-    
--   releaseCycle: "R525-Linux (PB)"
-    support: true
-    eol: 2023-12-01
-    latest: "525.116.03"
-    link: https://www.nvidia.com/Download/driverResults.aspx/204639/
-    releaseDate: 2022-11-10
-    
--   releaseCycle: "R515-Windows (PB)"
-    support: true
-    eol: 2023-05-01
-    latest: "517.71"
-    link: https://www.nvidia.com/download/driverResults.aspx/195851/
-    releaseDate: 2022-05-11    
-    
--   releaseCycle: "R515-Linux (PB)"
-    support: true
-    eol: 2023-05-01
-    latest: "515.105.01"
-    link: https://www.nvidia.com/Download/driverResults.aspx/202059/
-    releaseDate: 2022-05-11
-    
--   releaseCycle: "R510-Windows (PB)"
-    support: true
-    eol: 2023-01-01
-    latest: "513.91"
-    link: https://www.nvidia.com/download/driverResults.aspx/194565/
-    releaseDate: 2022-01-14
-    
--   releaseCycle: "R510-Linux (PB)"
-    support: true
-    eol: 2023-01-01
-    latest: "510.108.03"
-    link: https://www.nvidia.com/download/driverResults.aspx/194569/
-    releaseDate: 2022-01-14
-    
--   releaseCycle: "R495-Windows (NFB)"
-    support: false
-    eol: 2022-01-14
-    latest: "497.29"
-    link: https://www.nvidia.com/Download/driverResults.aspx/184717/
-    releaseDate: 2021-10-12
-    
--   releaseCycle: "R495-Linux (NFB)"
-    support: false
-    eol: 2022-10-12
-    latest: "495.46"
-    link: https://www.nvidia.com/Download/driverResults.aspx/184248/
-    releaseDate: 2021-10-26
-    
--   releaseCycle: "R470-Windows"
-    lts: true
-    support: 2021-09-20
-    eol: 2024-07-01
-    latest: "474.04"
-    link: https://www.nvidia.com/Download/driverResults.aspx/196634/
-    releaseDate: 2021-06-22
-    
--   releaseCycle: "R470-Linux"
-    lts: true
-    support: 2021-10-26
-    eol: 2024-07-20
-    latest: "470.182.03"
-    link: https://www.nvidia.com/Download/driverResults.aspx/200634/
-    releaseDate: 2021-07-19
-    
--   releaseCycle: "R460-Windows (PB)"
-    support: 2021-06-23
-    eol: 2022-01-01
-    latest: "462.96"
-    link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-460-91-03/
-    releaseDate: 2020-12-15
-    
--   releaseCycle: "R460-Linux (PB)"
-    support: 2021-07-19
-    eol: 2022-01-01
-    latest: "460.91.03"
-    link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-460-91-03/
-    releaseDate: 2021-01-07
-    
--   releaseCycle: "R450-Windows"
-    lts: true
-    support: 2020-12-15
-    eol: 2023-07-01
-    latest: "453.94"
-    link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-450-216-04/index.html
-    releaseDate: 2020-06-24
-    
--   releaseCycle: "R450-Linux"
-    lts: true
-    support: 2020-10-07
-    eol: 2023-07-01
-    latest: "450.216.04"
-    link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-450-216-04/index.html
-    releaseDate: 2020-06-24
-    
--   releaseCycle: "R418-Windows"
-    lts: true
-    support: 2019-04-23
-    eol: 2022-03-01
-    latest: "427.45"
-    link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-418-19702/
-    releaseDate: 2019-02-04
-    
--   releaseCycle: "R418-Linux"
-    lts: true
-    support: 2019-03-20
-    eol: 2022-03-01
-    latest: "418.197.02"
-    link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-418-19702/
-    releaseDate: 2019-01-30
-    
--   releaseCycle: "R390-Windows"
-    lts: true
-    support: 2018-07-31
-    eol: 2021-10-26
-    latest: "392.68"
-    link: https://www.nvidia.com/download/driverResults.aspx/181267/
-    releaseDate: 2018-01-08
--   releaseCycle: "R390-Linux"
-    lts: true
-    support: 2018-03-10
-    eol: 2022-11-22
-    latest: "390.157"
-    link: https://www.nvidia.com/Download/driverResults.aspx/196214/
-    releaseDate: 2018-01-04
+  -   releaseCycle: "R530-Windows (NFB)"
+      support: true
+      eol: 2023-06-24
+      latest: "531.79"
+      link: https://www.nvidia.com/Download/driverResults.aspx/204772/
+      releaseDate: 2023-03-23
+
+  -   releaseCycle: "R530-Linux (NFB)"
+      support: true
+      eol: 2023-06-24
+      latest: "530.41.03"
+      link: https://www.nvidia.com/Download/driverResults.aspx/200481/
+      releaseDate: 2023-03-23
+
+  -   releaseCycle: "R525-Windows (PB)"
+      support: true
+      eol: 2023-12-01
+      latest: "528.95"
+      link: https://www.nvidia.com/Download/driverResults.aspx/204574/
+      releaseDate: 2022-11-10
+
+  -   releaseCycle: "R525-Linux (PB)"
+      support: true
+      eol: 2023-12-01
+      latest: "525.116.03"
+      link: https://www.nvidia.com/Download/driverResults.aspx/204639/
+      releaseDate: 2022-11-10
+
+  -   releaseCycle: "R515-Windows (PB)"
+      support: true
+      eol: 2023-05-01
+      latest: "517.71"
+      link: https://www.nvidia.com/download/driverResults.aspx/195851/
+      releaseDate: 2022-05-11
+
+  -   releaseCycle: "R515-Linux (PB)"
+      support: true
+      eol: 2023-05-01
+      latest: "515.105.01"
+      link: https://www.nvidia.com/Download/driverResults.aspx/202059/
+      releaseDate: 2022-05-11
+
+  -   releaseCycle: "R510-Windows (PB)"
+      support: true
+      eol: 2023-01-01
+      latest: "513.91"
+      link: https://www.nvidia.com/download/driverResults.aspx/194565/
+      releaseDate: 2022-01-14
+
+  -   releaseCycle: "R510-Linux (PB)"
+      support: true
+      eol: 2023-01-01
+      latest: "510.108.03"
+      link: https://www.nvidia.com/download/driverResults.aspx/194569/
+      releaseDate: 2022-01-14
+
+  -   releaseCycle: "R495-Windows (NFB)"
+      support: false
+      eol: 2022-01-14
+      latest: "497.29"
+      link: https://www.nvidia.com/Download/driverResults.aspx/184717/
+      releaseDate: 2021-10-12
+
+  -   releaseCycle: "R495-Linux (NFB)"
+      support: false
+      eol: 2022-10-12
+      latest: "495.46"
+      link: https://www.nvidia.com/Download/driverResults.aspx/184248/
+      releaseDate: 2021-10-26
+
+  -   releaseCycle: "R470-Windows"
+      lts: true
+      support: 2021-09-20
+      eol: 2024-07-01
+      latest: "474.04"
+      link: https://www.nvidia.com/Download/driverResults.aspx/196634/
+      releaseDate: 2021-06-22
+
+  -   releaseCycle: "R470-Linux"
+      lts: true
+      support: 2021-10-26
+      eol: 2024-07-20
+      latest: "470.182.03"
+      link: https://www.nvidia.com/Download/driverResults.aspx/200634/
+      releaseDate: 2021-07-19
+
+  -   releaseCycle: "R460-Windows (PB)"
+      support: 2021-06-23
+      eol: 2022-01-01
+      latest: "462.96"
+      link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-460-91-03/
+      releaseDate: 2020-12-15
+
+  -   releaseCycle: "R460-Linux (PB)"
+      support: 2021-07-19
+      eol: 2022-01-01
+      latest: "460.91.03"
+      link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-460-91-03/
+      releaseDate: 2021-01-07
+
+  -   releaseCycle: "R450-Windows"
+      lts: true
+      support: 2020-12-15
+      eol: 2023-07-01
+      latest: "453.94"
+      link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-450-216-04/index.html
+      releaseDate: 2020-06-24
+
+  -   releaseCycle: "R450-Linux"
+      lts: true
+      support: 2020-10-07
+      eol: 2023-07-01
+      latest: "450.216.04"
+      link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-450-216-04/index.html
+      releaseDate: 2020-06-24
+
+  -   releaseCycle: "R418-Windows"
+      lts: true
+      support: 2019-04-23
+      eol: 2022-03-01
+      latest: "427.45"
+      link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-418-19702/
+      releaseDate: 2019-02-04
+
+  -   releaseCycle: "R418-Linux"
+      lts: true
+      support: 2019-03-20
+      eol: 2022-03-01
+      latest: "418.197.02"
+      link: https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-418-19702/
+      releaseDate: 2019-01-30
+
+  -   releaseCycle: "R390-Windows"
+      lts: true
+      support: 2018-07-31
+      eol: 2021-10-26
+      latest: "392.68"
+      link: https://www.nvidia.com/download/driverResults.aspx/181267/
+      releaseDate: 2018-01-08
+  -   releaseCycle: "R390-Linux"
+      lts: true
+      support: 2018-03-10
+      eol: 2022-11-22
+      latest: "390.157"
+      link: https://www.nvidia.com/Download/driverResults.aspx/196214/
+      releaseDate: 2018-01-04
 
 ---
 
diff --git a/products/nvidiaproducts.md b/products/nvidiaproducts.md
index b162aa1b478..600c2c2b528 100644
--- a/products/nvidiaproducts.md
+++ b/products/nvidiaproducts.md
@@ -5,6 +5,7 @@ alternate_urls:
 -   /nvidia-products
 -   /nvidia-gpus
 category: device
+tags: nvidia
 iconSlug: nvidia
 releasePolicyLink: https://www.nvidia.com/en-us/geforce/graphics-cards/
 activeSupportColumn: true
diff --git a/products/office.md b/products/office.md
index c04b723b4eb..492fefd465e 100644
--- a/products/office.md
+++ b/products/office.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Office
 category: app
+tags: microsoft
 iconSlug: microsoftoffice
 permalink: /office
 alternate_urls:
diff --git a/products/openbsd.md b/products/openbsd.md
index 21399922943..43440662fb5 100644
--- a/products/openbsd.md
+++ b/products/openbsd.md
@@ -1,6 +1,7 @@
 ---
 title: OpenBSD
 category: os
+tags: bsd-distribution
 iconSlug: openbsd
 permalink: /openbsd
 versionCommand: uname -r
diff --git a/products/opensearch.md b/products/opensearch.md
index 45976dc3593..cbe4d755514 100644
--- a/products/opensearch.md
+++ b/products/opensearch.md
@@ -1,6 +1,7 @@
 ---
 title: OpenSearch
 category: db
+tags: amazon
 iconSlug: opensearch
 permalink: /opensearch
 releasePolicyLink: https://www.opensearch.org/releases.html
@@ -30,7 +31,7 @@ releases:
 
 ## Official Release schedule
 
-Find below the next releases after `2.4.0` : 
+Find below the next releases after `2.4.0` :
 
 - [`2.4.0`](https://opensearch.org/blog/opensearch-2-4-is-available-today/) released on `2022-11-15`
 - `2.5.0` is planned for `2023-01-17`
diff --git a/products/opensuse.md b/products/opensuse.md
index 33068c5ad2e..8cc8a810fd3 100644
--- a/products/opensuse.md
+++ b/products/opensuse.md
@@ -1,6 +1,7 @@
 ---
 title: openSUSE
 category: os
+tags: linux-distribution
 iconSlug: opensuse
 permalink: /opensuse
 alternate_urls:
diff --git a/products/openwrt.md b/products/openwrt.md
index f6a47a33e90..58cfe1d9b9e 100644
--- a/products/openwrt.md
+++ b/products/openwrt.md
@@ -1,6 +1,7 @@
 ---
 title: OpenWrt
 category: os
+tags: linux-distribution
 iconSlug: openwrt
 permalink: /openwrt
 alternate_urls:
diff --git a/products/oracle-database.md b/products/oracle-database.md
index ce5a9dc9ba2..d2d7df81139 100644
--- a/products/oracle-database.md
+++ b/products/oracle-database.md
@@ -1,6 +1,7 @@
 ---
 title: Oracle Database
 category: db
+tags: oracle
 iconSlug: oracle
 permalink: /oracle-database
 versionCommand: SELECT BANNER_FULL FROM V$VERSION;
diff --git a/products/oraclelinux.md b/products/oraclelinux.md
index 83151d34e20..2dc82ccc4bf 100644
--- a/products/oraclelinux.md
+++ b/products/oraclelinux.md
@@ -2,6 +2,7 @@
 permalink: /oraclelinux
 title: Oracle Linux
 category: os
+tags: linux-distribution oracle
 versionCommand: lsb_release --release
 releasePolicyLink: https://www.oracle.com/a/ocom/docs/elsp-lifetime-069338.pdf
 releaseDateColumn: true
diff --git a/products/pan-cortex-xdr.md b/products/pan-cortex-xdr.md
index 8b18d02da10..ee7904f7ea7 100644
--- a/products/pan-cortex-xdr.md
+++ b/products/pan-cortex-xdr.md
@@ -1,6 +1,7 @@
 ---
 title: Palo Alto Networks Cortex XDR agent
 category: app
+tags: palo-alto-networks
 permalink: /cortex-xdr
 alternate_urls:
 -   /pan-xdr
diff --git a/products/pan-gp.md b/products/pan-gp.md
index 91b1e3c20af..36b4d3ffd7f 100644
--- a/products/pan-gp.md
+++ b/products/pan-gp.md
@@ -1,6 +1,7 @@
 ---
 title: Palo Alto Networks GlobalProtect App
 category: app
+tags: palo-alto-networks
 permalink: /pangp
 releasePolicyLink: https://www.paloaltonetworks.com/services/support/end-of-life-announcements/end-of-life-summary
 
diff --git a/products/pan-os.md b/products/pan-os.md
index 9736d1d32cd..9be811d1513 100644
--- a/products/pan-os.md
+++ b/products/pan-os.md
@@ -1,6 +1,7 @@
 ---
 title: Palo Alto Networks PAN-OS
 category: os
+tags: palo-alto-networks
 permalink: /panos
 versionCommand: show system info | match sw-version
 releasePolicyLink: https://www.paloaltonetworks.com/services/support/end-of-life-announcements/end-of-life-summary
diff --git a/products/phpmyadmin.md b/products/phpmyadmin.md
index 41828e3ebce..91f860bd225 100644
--- a/products/phpmyadmin.md
+++ b/products/phpmyadmin.md
@@ -1,6 +1,7 @@
 ---
 title: PHPMyAdmin
 category: server-app
+tags: php-runtime
 iconSlug: phpmyadmin
 permalink: /phpmyadmin
 releasePolicyLink: https://www.phpmyadmin.net/downloads/#support
diff --git a/products/pixel.md b/products/pixel.md
index 5e4923b6570..f2ce3a7b397 100644
--- a/products/pixel.md
+++ b/products/pixel.md
@@ -1,6 +1,7 @@
 ---
 title: Google Pixel
 category: device
+tags: google mobile-phone
 iconSlug: google
 permalink: /pixel
 versionCommand: "Settings -> About Phone -> Regulatory labels"
diff --git a/products/plesk.md b/products/plesk.md
index 3d2229d0d73..10a4f7b14bf 100644
--- a/products/plesk.md
+++ b/products/plesk.md
@@ -1,6 +1,7 @@
 ---
 title: Plesk
 category: server-app
+tags: php-runtime
 iconSlug: plesk
 permalink: /plesk
 versionCommand: plesk version
diff --git a/products/pop_os.md b/products/pop_os.md
index e940d8edb61..7691bba4e36 100644
--- a/products/pop_os.md
+++ b/products/pop_os.md
@@ -1,6 +1,7 @@
 ---
 title: Pop!_OS
 category: os
+tags: linux-distribution
 iconSlug: popos
 permalink: /pop_os
 alternate_urls:
diff --git a/products/powershell.md b/products/powershell.md
index b9b058a1a09..1be94c4df0c 100644
--- a/products/powershell.md
+++ b/products/powershell.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft PowerShell
 category: lang
+tags: microsoft
 iconSlug: powershell
 permalink: /powershell
 alternate_urls:
diff --git a/products/quarkus.md b/products/quarkus.md
index 5704668feec..ce27e6c2509 100644
--- a/products/quarkus.md
+++ b/products/quarkus.md
@@ -1,6 +1,7 @@
 ---
 title: Quarkus
 category: framework
+tags: java-runtime
 iconSlug: quarkus
 permalink: /quarkus-framework
 alternate_urls:
diff --git a/products/rabbitmq.md b/products/rabbitmq.md
index 41d8a94615e..201a8457cb8 100644
--- a/products/rabbitmq.md
+++ b/products/rabbitmq.md
@@ -1,6 +1,7 @@
 ---
 title: RabbitMQ
 category: server-app
+tags: erlang-runtime
 iconSlug: rabbitmq
 permalink: /rabbitmq
 versionCommand: rabbitmqctl --version
diff --git a/products/react.md b/products/react.md
index ca131af3be0..b7fa208ca4a 100644
--- a/products/react.md
+++ b/products/react.md
@@ -3,6 +3,7 @@ title: React
 permalink: /react
 iconSlug: react
 category: framework
+tags: meta javascript-runtime
 releasePolicyLink: https://react.dev/community/versioning-policy
 changelogTemplate: https://github.com/facebook/react/releases/tag/v__LATEST__
 activeSupportColumn: true
diff --git a/products/readynas.md b/products/readynas.md
index b59144247f7..856a9f4846f 100644
--- a/products/readynas.md
+++ b/products/readynas.md
@@ -1,6 +1,7 @@
 ---
 title: Netgear ReadyNAS
 category: device
+tags: linux-distribution
 permalink: /readynas
 changelogTemplate: "https://www.netgear.com/support/product/{{'__RELEASE_CYCLE__'|downcase}}"
 releaseColumn: false
diff --git a/products/red-hat-openshift.md b/products/red-hat-openshift.md
index a96bb7b4e56..5f17095ce05 100644
--- a/products/red-hat-openshift.md
+++ b/products/red-hat-openshift.md
@@ -1,6 +1,7 @@
 ---
 title: Red Hat OpenShift
 category: server-app
+tags: red-hat
 iconSlug: redhatopenshift
 permalink: /red-hat-openshift
 alternate_urls:
diff --git a/products/redhat.md b/products/redhat.md
index 20e8f51a033..70e45435feb 100644
--- a/products/redhat.md
+++ b/products/redhat.md
@@ -1,6 +1,7 @@
 ---
 title: Red Hat Enterprise Linux
 category: os
+tags: red-hat
 iconSlug: redhat
 permalink: /rhel
 alternate_urls:
diff --git a/products/redmine.md b/products/redmine.md
index b1a5e1f6a40..139235b5801 100644
--- a/products/redmine.md
+++ b/products/redmine.md
@@ -3,6 +3,7 @@ title: Redmine
 permalink: /redmine
 releasePolicyLink: https://www.redmine.org/projects/redmine/news
 category: server-app
+tags: ruby-runtime
 activeSupportColumn: false
 releaseDateColumn: true
 releaseColumn: true
diff --git a/products/rockylinux.md b/products/rockylinux.md
index 04d02aa7059..9f638337c20 100644
--- a/products/rockylinux.md
+++ b/products/rockylinux.md
@@ -1,6 +1,7 @@
 ---
 title: Rocky Linux
 category: os
+tags: linux-distribution
 iconSlug: rockylinux
 permalink: /rocky-linux
 alternate_urls:
diff --git a/products/roundcube.md b/products/roundcube.md
index fbe30c19ea0..ebee421d95f 100644
--- a/products/roundcube.md
+++ b/products/roundcube.md
@@ -2,6 +2,7 @@
 title: Roundcube Webmail
 permalink: /roundcube
 category: server-app
+tags: php-runtime
 activeSupportColumn: true
 changelogTemplate: https://github.com/roundcube/roundcubemail/releases/tag/__LATEST__
 auto:
@@ -63,7 +64,7 @@ iconSlug: roundcube
 
 ---
 
-> [Roundcube Webmail](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. 
+> [Roundcube Webmail](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface.
 > It provides full functionality you expect from an email client, including MIME support, address book, folder manipulation, message searching and spell checking.
 
 As of the last release, the project supports last 2 release branches in a "LTS low maintenance mode", which only includes important security updates only. Regular improvement updates are only available on the latest stable release.
diff --git a/products/ruby-on-rails.md b/products/ruby-on-rails.md
index f9dc6e3c76e..5fbccb68d09 100644
--- a/products/ruby-on-rails.md
+++ b/products/ruby-on-rails.md
@@ -11,6 +11,7 @@ releasePolicyLink: https://guides.rubyonrails.org/maintenance_policy.html
 changelogTemplate: https://github.com/rails/rails/releases/tag/v__LATEST__
 releaseDateColumn: true
 category: framework
+tags: ruby-runtime
 auto:
 -   git: https://github.com/rails/rails.git
     regex: v(?<major>[1-9]\d*)\.(?<minor>0|[1-9]\d*)\.(?<patch>0|[1-9]\d*)(\.(?<tiny>0|[1-9]\d*))?$
diff --git a/products/samsungmobile.md b/products/samsungmobile.md
index 7570e81dc12..ac13bf52317 100644
--- a/products/samsungmobile.md
+++ b/products/samsungmobile.md
@@ -1,6 +1,7 @@
 ---
 title: Samsung Mobile
 category: device
+tags: mobile-phone smartwatch tablet
 iconSlug: samsung
 permalink: /samsung-mobile
 alternate_urls:
diff --git a/products/satellite.md b/products/satellite.md
index e1f8bcc79d9..cfbc6592f5a 100644
--- a/products/satellite.md
+++ b/products/satellite.md
@@ -1,6 +1,7 @@
 ---
 title: Red Hat Satellite
 category: server-app
+tags: red-hat
 iconSlug: redhat
 permalink: /redhat-satellite
 alternate_urls:
diff --git a/products/scala.md b/products/scala.md
index 91da17af039..9c14f050aa7 100644
--- a/products/scala.md
+++ b/products/scala.md
@@ -1,6 +1,7 @@
 ---
 title: Scala
 category: lang
+tags: java-runtime
 iconSlug: scala
 permalink: /scala
 alternate_urls:
diff --git a/products/slackware.md b/products/slackware.md
index cfa0702184c..a01bafae6af 100644
--- a/products/slackware.md
+++ b/products/slackware.md
@@ -1,6 +1,7 @@
 ---
 title: Slackware Linux
 category: os
+tags: linux-distribution
 iconSlug: slackware
 permalink: /slackware
 alternate_urls:
diff --git a/products/sles.md b/products/sles.md
index 8ac43eba85e..5d1bf43709f 100644
--- a/products/sles.md
+++ b/products/sles.md
@@ -1,6 +1,7 @@
 ---
 title: SUSE Linux Enterprise Server
 category: os
+tags: linux-distribution
 iconSlug: suse
 permalink: /sles
 alternate_urls:
diff --git a/products/solr.md b/products/solr.md
index 5c2e8dda83a..b22b3177646 100644
--- a/products/solr.md
+++ b/products/solr.md
@@ -1,6 +1,7 @@
 ---
 title: Apache Solr
 category: server-app
+tags: apache java-runtime
 iconSlug: apachesolr
 permalink: /solr
 alternate_urls:
diff --git a/products/sonarqube.md b/products/sonarqube.md
index e4ee4137602..5e1d4328517 100644
--- a/products/sonarqube.md
+++ b/products/sonarqube.md
@@ -1,6 +1,7 @@
 ---
 title: SonarQube
 category: server-app
+tags: java-runtime
 iconSlug: sonarqube
 permalink: /sonar
 alternate_urls:
diff --git a/products/spring-boot.md b/products/spring-boot.md
index a4a85044a2f..34a94708177 100644
--- a/products/spring-boot.md
+++ b/products/spring-boot.md
@@ -1,6 +1,7 @@
 ---
 title: Spring Boot
 category: framework
+tags: java-runtime vmware
 iconSlug: springboot
 permalink: /spring-boot
 alternate_urls:
diff --git a/products/spring-framework.md b/products/spring-framework.md
index 843fa8b1c04..1aa99ad53ad 100644
--- a/products/spring-framework.md
+++ b/products/spring-framework.md
@@ -1,6 +1,7 @@
 ---
 title: Spring Framework
 category: framework
+tags: java-runtime vmware
 iconSlug: spring
 permalink: /spring-framework
 alternate_urls:
diff --git a/products/surface.md b/products/surface.md
index 79e4fcf07ae..e19271b03ef 100644
--- a/products/surface.md
+++ b/products/surface.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Surface
 category: device
+tags: microsoft
 iconSlug: windows
 permalink: /surface
 releasePolicyLink: https://learn.microsoft.com/surface/surface-driver-firmware-lifecycle-support
diff --git a/products/symfony.md b/products/symfony.md
index 2b468c9994a..0aa14e64b77 100644
--- a/products/symfony.md
+++ b/products/symfony.md
@@ -1,6 +1,7 @@
 ---
 title: Symfony
 category: framework
+tags: php-runtime
 iconSlug: symfony
 permalink: /symfony
 versionCommand: composer show | grep "symfony/"
diff --git a/products/tails.md b/products/tails.md
index 5709cdcbd59..0bee7593fa4 100644
--- a/products/tails.md
+++ b/products/tails.md
@@ -1,6 +1,7 @@
 ---
 title: Tails
 category: os
+tags: linux-distribution
 iconSlug: tails
 permalink: /tails
 versionCommand: cat /etc/amnesia/version
diff --git a/products/terraform.md b/products/terraform.md
index e66ca372cb8..1116ee216ee 100644
--- a/products/terraform.md
+++ b/products/terraform.md
@@ -1,6 +1,7 @@
 ---
 title: Hashicorp Terraform
 category: app
+tags: hashicorp
 iconSlug: terraform
 permalink: /terraform
 versionCommand: terraform --version
diff --git a/products/tomcat.md b/products/tomcat.md
index 2e7d2399e57..5b8a4daffe1 100644
--- a/products/tomcat.md
+++ b/products/tomcat.md
@@ -1,6 +1,7 @@
 ---
 title: Apache Tomcat
 category: server-app
+tags: apache web-server
 iconSlug: apachetomcat
 permalink: /tomcat
 versionCommand: ./bin/version.sh
diff --git a/products/twig.md b/products/twig.md
index 22fb5da30d8..783b50ecb20 100644
--- a/products/twig.md
+++ b/products/twig.md
@@ -2,6 +2,7 @@
 title: Twig
 permalink: /twig
 category: framework
+tags: php-runtime
 activeSupportColumn: false
 releaseDateColumn: true
 releaseColumn: true
diff --git a/products/typo3.md b/products/typo3.md
index 693145c6c6b..4123e3c841d 100644
--- a/products/typo3.md
+++ b/products/typo3.md
@@ -1,6 +1,7 @@
 ---
 title: TYPO3
 category: server-app
+tags: php-runtime
 permalink: /typo3
 releasePolicyLink: https://get.typo3.org/
 changelogTemplate: https://get.typo3.org/release-notes/__LATEST__
diff --git a/products/ubuntu.md b/products/ubuntu.md
index 0c2ef5a256a..e3d151de77b 100644
--- a/products/ubuntu.md
+++ b/products/ubuntu.md
@@ -1,6 +1,7 @@
 ---
 title: Ubuntu
 category: os
+tags: linux-distribution
 iconSlug: ubuntu
 permalink: /ubuntu
 versionCommand: lsb_release --release
diff --git a/products/umbraco.md b/products/umbraco.md
index a57341a0da8..56b986f93a9 100644
--- a/products/umbraco.md
+++ b/products/umbraco.md
@@ -1,6 +1,7 @@
 ---
 title: Umbraco CMS
 category: server-app
+tags: dotnet-runtime
 iconSlug: umbraco
 permalink: /umbraco
 alternative_urls:
diff --git a/products/varnish.md b/products/varnish.md
index d210cc37707..42ca3a0f130 100644
--- a/products/varnish.md
+++ b/products/varnish.md
@@ -1,6 +1,7 @@
 ---
 title: Varnish
 category: server-app
+tags: web-server
 permalink: /varnish
 versionCommand: varnishd -V
 releasePolicyLink: https://varnish-cache.org/releases/
diff --git a/products/visualstudio.md b/products/visualstudio.md
index a76c8ec90ac..a924b568f98 100644
--- a/products/visualstudio.md
+++ b/products/visualstudio.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Visual Studio
 category: app
+tags: microsoft
 iconSlug: visualstudio
 permalink: /visual-studio
 alternate_urls:
diff --git a/products/vmware-esxi.md b/products/vmware-esxi.md
index 9046f80caeb..105b61921d2 100644
--- a/products/vmware-esxi.md
+++ b/products/vmware-esxi.md
@@ -1,6 +1,7 @@
 ---
 title: VMware ESXi
 category: os
+tags: vmware
 iconSlug: vmware
 permalink: /esxi
 alternate_urls:
diff --git a/products/vmware-horizon.md b/products/vmware-horizon.md
index 61886c7afa6..055daf14111 100644
--- a/products/vmware-horizon.md
+++ b/products/vmware-horizon.md
@@ -1,6 +1,7 @@
 ---
 title: VMware Horizon
 category: app
+tags: vmware
 iconSlug: vmware
 permalink: /horizon
 alternate_urls:
diff --git a/products/vmware-photon.md b/products/vmware-photon.md
index 88c577a322b..b33dbbd502b 100644
--- a/products/vmware-photon.md
+++ b/products/vmware-photon.md
@@ -1,6 +1,7 @@
 ---
 title: VMware Photon
 category: os
+tags: vmware
 iconSlug: vmware
 permalink: /photon
 alternate_urls:
diff --git a/products/vmware-srm.md b/products/vmware-srm.md
index a06b0c0f5b9..3ef7455bc19 100644
--- a/products/vmware-srm.md
+++ b/products/vmware-srm.md
@@ -1,6 +1,7 @@
 ---
 title: VMware Site Recovery Manager
 category: server-app
+tags: vmware
 iconSlug: vmware
 permalink: /vmware-srm
 alternate_urls:
diff --git a/products/vmware-vcenter.md b/products/vmware-vcenter.md
index a5826239feb..fd7b01470ed 100644
--- a/products/vmware-vcenter.md
+++ b/products/vmware-vcenter.md
@@ -1,6 +1,7 @@
 ---
 title: VMware vCenter Server
 category: app
+tags: vmware
 iconSlug: vmware
 permalink: /vcenter
 alternate_urls:
diff --git a/products/vue.md b/products/vue.md
index 59ec3c8f0f5..6a2fd73d4fe 100644
--- a/products/vue.md
+++ b/products/vue.md
@@ -1,6 +1,7 @@
 ---
 title: Vue
 category: framework
+tags: javascript-runtime
 iconSlug: vuedotjs
 permalink: /vue
 alternate_urls:
diff --git a/products/vuetify.md b/products/vuetify.md
index ebce9c29aa3..d84781b69a0 100644
--- a/products/vuetify.md
+++ b/products/vuetify.md
@@ -1,9 +1,9 @@
 ---
 title: Vuetify
 category: framework
+tags: javascript-runtime
 iconSlug: vuetify
 permalink: /vuetify
-
 versionCommand: npm list vuetify
 releasePolicyLink: https://vuetifyjs.com/en/introduction/long-term-support/
 changelogTemplate: https://github.com/vuetifyjs/vuetify/releases/tag/v__LATEST__
@@ -15,6 +15,7 @@ auto:
 
 identifiers:
 -   purl: pkg:npm/vuetify
+
 releases:
 -   releaseCycle: "3"
     support: true
diff --git a/products/wagtail.md b/products/wagtail.md
index ec4ad3f69c0..06445290947 100644
--- a/products/wagtail.md
+++ b/products/wagtail.md
@@ -1,6 +1,7 @@
 ---
 title: Wagtail
 category: framework
+tags: python-runtime
 iconSlug: wagtail
 permalink: /wagtail
 versionCommand: python -c "import wagtail; print(wagtail.__version__)"
diff --git a/products/watchos.md b/products/watchos.md
index c1496f6b40d..61136c53cf2 100644
--- a/products/watchos.md
+++ b/products/watchos.md
@@ -1,6 +1,7 @@
 ---
 title: Apple watchOS
 category: os
+tags: apple smartwatch
 iconSlug: apple
 permalink: /watchos
 releasePolicyLink: https://en.wikipedia.org/wiki/WatchOS#Version_history
diff --git a/products/windows.md b/products/windows.md
index ad49737ad72..04ee33b4975 100644
--- a/products/windows.md
+++ b/products/windows.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Windows
 category: os
+tags: microsoft windows
 iconSlug: windows
 permalink: /windows
 versionCommand: winver
diff --git a/products/windowsEmbedded.md b/products/windowsEmbedded.md
index 966b26f0a5f..be3c3ee4d29 100644
--- a/products/windowsEmbedded.md
+++ b/products/windowsEmbedded.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Windows Embedded
 category: os
+tags: microsoft windows
 iconSlug: windows
 permalink: /windows-embedded
 alternate_urls:
diff --git a/products/windowsServer.md b/products/windowsServer.md
index c478ca21d62..0743cde7ef9 100644
--- a/products/windowsServer.md
+++ b/products/windowsServer.md
@@ -1,6 +1,7 @@
 ---
 title: Microsoft Windows Server
 category: os
+tags: microsoft windows
 iconSlug: windows
 permalink: /windows-server
 alternate_urls:
diff --git a/products/wordpress.md b/products/wordpress.md
index f9bfbc91c2b..d65c06053c7 100644
--- a/products/wordpress.md
+++ b/products/wordpress.md
@@ -1,6 +1,7 @@
 ---
 title: WordPress
 category: server-app
+tags: php-runtime
 iconSlug: wordpress
 permalink: /wordpress
 versionCommand: wp core version
diff --git a/products/yocto.md b/products/yocto.md
index f0fa1ee91cd..b7985f74c73 100644
--- a/products/yocto.md
+++ b/products/yocto.md
@@ -1,6 +1,7 @@
 ---
 title: Yocto Project
 category: os
+tags: linux-distribution
 permalink: /yocto
 alternate_urls:
 -   /yocto-project
diff --git a/products/zabbix.md b/products/zabbix.md
index 76f39b42915..f3e19816543 100644
--- a/products/zabbix.md
+++ b/products/zabbix.md
@@ -1,6 +1,7 @@
 ---
 title: Zabbix
 category: server-app
+tags: php-runtime
 permalink: /zabbix
 versionCommand: zabbix_server -V
 releasePolicyLink: https://www.zabbix.com/life_cycle_and_release_policy
diff --git a/products/zookeeper.md b/products/zookeeper.md
index e9f906ee25a..dd54d164d80 100644
--- a/products/zookeeper.md
+++ b/products/zookeeper.md
@@ -1,6 +1,7 @@
 ---
 title: Apache ZooKeeper
 category: server-app
+tags: apache java-runtime
 permalink: /zookeeper
 alternate_urls:
 -   /apache_zookeeper