diff --git a/packages/catalog-model/examples/artist-lookup-component.yaml b/packages/catalog-model/examples/artist-lookup-component.yaml
index 448dd13fa3..79dd3bccf6 100644
--- a/packages/catalog-model/examples/artist-lookup-component.yaml
+++ b/packages/catalog-model/examples/artist-lookup-component.yaml
@@ -3,6 +3,9 @@ kind: Component
 metadata:
   name: artist-lookup
   description: Artist Lookup
+  tags:
+    - java
+    - data
 spec:
   type: service
   lifecycle: experimental
diff --git a/packages/catalog-model/examples/podcast-api-component.yaml b/packages/catalog-model/examples/podcast-api-component.yaml
index 19f9a3d4de..c1b1c9281c 100644
--- a/packages/catalog-model/examples/podcast-api-component.yaml
+++ b/packages/catalog-model/examples/podcast-api-component.yaml
@@ -3,6 +3,8 @@ kind: Component
 metadata:
   name: podcast-api
   description: Podcast API
+  tags:
+    - java
 spec:
   type: service
   lifecycle: experimental
diff --git a/packages/catalog-model/examples/queue-proxy-component.yaml b/packages/catalog-model/examples/queue-proxy-component.yaml
index a9f41b8776..c9b130db52 100644
--- a/packages/catalog-model/examples/queue-proxy-component.yaml
+++ b/packages/catalog-model/examples/queue-proxy-component.yaml
@@ -3,6 +3,9 @@ kind: Component
 metadata:
   name: queue-proxy
   description: Queue Proxy
+  tags:
+    - go
+    - website
 spec:
   type: website
   lifecycle: production
diff --git a/packages/catalog-model/examples/searcher-component.yaml b/packages/catalog-model/examples/searcher-component.yaml
index 33d765117c..042fcb24a9 100644
--- a/packages/catalog-model/examples/searcher-component.yaml
+++ b/packages/catalog-model/examples/searcher-component.yaml
@@ -3,6 +3,8 @@ kind: Component
 metadata:
   name: searcher
   description: Searcher
+  tags:
+    - go
 spec:
   type: service
   lifecycle: production
diff --git a/packages/catalog-model/examples/shuffle-api-component.yaml b/packages/catalog-model/examples/shuffle-api-component.yaml
index 275c48d6ba..1f9de46d4e 100644
--- a/packages/catalog-model/examples/shuffle-api-component.yaml
+++ b/packages/catalog-model/examples/shuffle-api-component.yaml
@@ -3,6 +3,8 @@ kind: Component
 metadata:
   name: shuffle-api
   description: Shuffle API
+  tags:
+    - go
 spec:
   type: service
   lifecycle: production
diff --git a/packages/catalog-model/examples/streetlights-api.yaml b/packages/catalog-model/examples/streetlights-api.yaml
index 69a6d101cb..4aeef993bb 100644
--- a/packages/catalog-model/examples/streetlights-api.yaml
+++ b/packages/catalog-model/examples/streetlights-api.yaml
@@ -3,6 +3,8 @@ kind: API
 metadata:
   name: streetlights
   description: The Smartylighting Streetlights API allows you to remotely manage the city lights.
+  tags:
+    - unstable
 spec:
   type: asyncapi
   definition: |