diff --git a/catalog-info.yaml b/catalog-info.yaml
index a34589c..fcce2e0 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -135,3 +135,157 @@ spec:
 
 # ─── Per-service Components (from Watcher discovery) ─────────────────
 
+
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: demo-db
+  description: "demo-db service — part of petclinic-demo-andrej2"
+  labels:
+    backstage.io/environment: "dev"
+    app.kubernetes.io/managed-by: "backstage"
+  tags:
+    - deployment
+    - argocd
+    
+    - opentelemetry
+    
+    - load-testing
+    - k6
+    
+    - chaos-engineering
+    - chaos-mesh
+    
+    
+  annotations:
+    argocd/app-name: "petclinic-demo-andrej2"
+    argocd/app-namespace: "argocd"
+    argocd/instance-name: ""
+    backstage.io/source-location: "url:https://gitea.kyndemo.live/validate/petclinic-demo-andrej2/src/branch/main"
+    backstage.io/kubernetes-namespace: "demo-apps"
+    backstage.io/kubernetes-label-selector: "app=demo-db"
+    backstage.io/techdocs-ref: dir:.
+    gitea.kyndemo.live/repo-slug: "validate/petclinic-demo-andrej2"
+    sonarqube.org/project-key: petclinic-demo-andrej2
+    
+    grafana/grafana-instance: "default"
+    grafana/alert-label-selector: "app=demo-db"
+    grafana/dashboard-selector: "uid == 'otel-app-observability-v2'"
+    grafana.com/alert-label-selector: "app=demo-db"
+    grafana.com/dashboard-url: "https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=demo-db"
+    
+    k6/enabled: "true"
+    k6/test-configmap: "k6-test-petclinic-demo-andrej2"
+    k6/test-namespace: "demo-apps"
+    k6/target-service: "demo-db"
+    
+    chaos-mesh/enabled: "true"
+    
+  links:
+    - url: https://petclinic-demo-andrej2.kyndemo.live
+      title: Live Application
+      icon: web
+    - url: https://gitea.kyndemo.live/validate/petclinic-demo-andrej2
+      title: Repository
+      icon: github
+    - url: https://argocd.kyndemo.live/applications/petclinic-demo-andrej2
+      title: ArgoCD App
+      icon: dashboard
+    
+    - url: https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=demo-db
+      title: Grafana Dashboard
+      icon: dashboard
+    
+spec:
+  type: service
+  owner: "platform-engineering"
+  lifecycle: experimental
+
+  system: petclinic-demo-andrej2
+  dependsOn:
+    - component:default/argocd-service
+    
+    
+    - resource:default/otel-collector
+    
+    - resource:default/k6-operator
+
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: petclinic
+  description: "petclinic service — part of petclinic-demo-andrej2"
+  labels:
+    backstage.io/environment: "dev"
+    app.kubernetes.io/managed-by: "backstage"
+  tags:
+    - deployment
+    - argocd
+    
+    - opentelemetry
+    
+    - load-testing
+    - k6
+    
+    - chaos-engineering
+    - chaos-mesh
+    
+    
+    - java
+    
+  annotations:
+    argocd/app-name: "petclinic-demo-andrej2"
+    argocd/app-namespace: "argocd"
+    argocd/instance-name: ""
+    backstage.io/source-location: "url:https://gitea.kyndemo.live/validate/petclinic-demo-andrej2/src/branch/main"
+    backstage.io/kubernetes-namespace: "demo-apps"
+    backstage.io/kubernetes-label-selector: "app=petclinic"
+    backstage.io/techdocs-ref: dir:.
+    gitea.kyndemo.live/repo-slug: "validate/petclinic-demo-andrej2"
+    sonarqube.org/project-key: petclinic-demo-andrej2
+    
+    grafana/grafana-instance: "default"
+    grafana/alert-label-selector: "app=petclinic"
+    grafana/dashboard-selector: "uid == 'otel-app-observability-v2'"
+    grafana.com/alert-label-selector: "app=petclinic"
+    grafana.com/dashboard-url: "https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=petclinic"
+    
+    k6/enabled: "true"
+    k6/test-configmap: "k6-test-petclinic-demo-andrej2"
+    k6/test-namespace: "demo-apps"
+    k6/target-service: "petclinic"
+    
+    chaos-mesh/enabled: "true"
+    
+  links:
+    - url: https://petclinic-demo-andrej2.kyndemo.live
+      title: Live Application
+      icon: web
+    - url: https://gitea.kyndemo.live/validate/petclinic-demo-andrej2
+      title: Repository
+      icon: github
+    - url: https://argocd.kyndemo.live/applications/petclinic-demo-andrej2
+      title: ArgoCD App
+      icon: dashboard
+    
+    - url: https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=petclinic
+      title: Grafana Dashboard
+      icon: dashboard
+    
+spec:
+  type: service
+  owner: "platform-engineering"
+  lifecycle: experimental
+
+  system: petclinic-demo-andrej2
+  dependsOn:
+    - component:default/argocd-service
+    
+    
+    - resource:default/otel-collector
+    
+    - resource:default/k6-operator
+
+