diff --git a/workspaces/scorecard/app-config.local.EXAMPLE.yaml b/workspaces/scorecard/app-config.local.EXAMPLE.yaml
index 0d8b54811f..697097f21d 100644
--- a/workspaces/scorecard/app-config.local.EXAMPLE.yaml
+++ b/workspaces/scorecard/app-config.local.EXAMPLE.yaml
@@ -15,7 +15,7 @@ auth:
 catalog:
   locations:
     - type: file
-      target: ../../examples/all-scorecards-location.yaml
+      target: ../../examples/all-scorecard-locations.yaml
       rules:
         - allow: [Component]
     - type: file
diff --git a/workspaces/scorecard/app-config.yaml b/workspaces/scorecard/app-config.yaml
index bb58c6d9f7..96faf99abb 100644
--- a/workspaces/scorecard/app-config.yaml
+++ b/workspaces/scorecard/app-config.yaml
@@ -196,7 +196,7 @@ catalog:
     - allow: [Component, System, Group, Resource, Location, Template, API]
   locations:
     - type: file
-      target: ../../examples/all-scorecards-location.yaml
+      target: ../../examples/all-scorecard-locations.yaml
       rules:
         - allow: [Component]
     - type: file
diff --git a/workspaces/scorecard/examples/all-scorecards-location.yaml b/workspaces/scorecard/examples/all-scorecard-locations.yaml
similarity index 82%
rename from workspaces/scorecard/examples/all-scorecards-location.yaml
rename to workspaces/scorecard/examples/all-scorecard-locations.yaml
index 2101c94600..2064882816 100644
--- a/workspaces/scorecard/examples/all-scorecards-location.yaml
+++ b/workspaces/scorecard/examples/all-scorecard-locations.yaml
@@ -1,15 +1,16 @@
 apiVersion: backstage.io/v1alpha1
 kind: Location
 metadata:
-  name: all-scorecards-location
+  name: all-scorecard-locations
 
   description: A collection of all the scorecards
 spec:
   targets:
+    - ./components/all-scorecards-service-different-owner.yaml
+    - ./components/all-scorecards.yaml
     - ./components/dependabot-scorecard-only.yaml
     - ./components/github-scorecard-only.yaml
     - ./components/jira-scorecard-only.yaml
+    - ./components/no-scorecards.yaml
     - ./components/openssf-scorecard-only.yaml
     - ./components/sonarqube-scorecard-only.yaml
-    - ./components/all-scorecards.yaml
-    - ./components/no-scorecards.yaml
diff --git a/workspaces/scorecard/examples/components/all-scorecards-service-different-owner.yaml b/workspaces/scorecard/examples/components/all-scorecards-service-different-owner.yaml
new file mode 100644
index 0000000000..ef11714d89
--- /dev/null
+++ b/workspaces/scorecard/examples/components/all-scorecards-service-different-owner.yaml
@@ -0,0 +1,14 @@
+# Component with both GitHub and Jira Scorecards with not specified owner
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: all-scorecards-service-different-owner
+  annotations:
+    github.com/project-slug: redhat-developer/rhdh-plugins
+    backstage.io/source-location: url:https://github.com/redhat-developer/rhdh-plugins
+    jira/project-key: RSPT
+    jira/label: JupiterTeam
+spec:
+  type: service
+  owner: rhdh-team
+  lifecycle: production
diff --git a/workspaces/scorecard/examples/components/all-scorecards.yaml b/workspaces/scorecard/examples/components/all-scorecards.yaml
index 363d007eda..fdd5afdd61 100644
--- a/workspaces/scorecard/examples/components/all-scorecards.yaml
+++ b/workspaces/scorecard/examples/components/all-scorecards.yaml
@@ -1,29 +1,12 @@
----
-# Component with both GitHub and Jira Scorecards
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: all-scorecards-service
+  name: all-scorecards
   annotations:
     github.com/project-slug: redhat-developer/rhdh-plugins
     backstage.io/source-location: url:https://github.com/redhat-developer/rhdh-plugins
     jira/project-key: RSPT
 spec:
   type: service
-  owner: user:development/guest
-  lifecycle: production
----
-# Component with both GitHub and Jira Scorecards with not specified owner
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: all-scorecards-service-different-owner
-  annotations:
-    github.com/project-slug: redhat-developer/rhdh-plugins
-    backstage.io/source-location: url:https://github.com/redhat-developer/rhdh-plugins
-    jira/project-key: RSPT
-    jira/label: JupiterTeam
-spec:
-  type: service
-  owner: rhdh-team
+  owner: group:development/guests
   lifecycle: production
diff --git a/workspaces/scorecard/examples/components/dependabot-scorecard-only.yaml b/workspaces/scorecard/examples/components/dependabot-scorecard-only.yaml
index 707678b1df..40f44a236f 100644
--- a/workspaces/scorecard/examples/components/dependabot-scorecard-only.yaml
+++ b/workspaces/scorecard/examples/components/dependabot-scorecard-only.yaml
@@ -1,5 +1,3 @@
----
-# Component with OpenSSF Scorecard
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/workspaces/scorecard/examples/components/entities.yaml b/workspaces/scorecard/examples/components/entities.yaml
deleted file mode 100644
index 15964d2c9b..0000000000
--- a/workspaces/scorecard/examples/components/entities.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-system
-apiVersion: backstage.io/v1alpha1
-kind: System
-metadata:
-  name: examples
-spec:
-  owner: group:development/guests
----
-# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-component
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: example-website
-spec:
-  type: website
-  lifecycle: experimental
-  owner: group:development/guests
-  system: examples
-  providesApis: [example-grpc-api]
----
-# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-api
-apiVersion: backstage.io/v1alpha1
-kind: API
-metadata:
-  name: example-grpc-api
-spec:
-  type: grpc
-  lifecycle: experimental
-  owner: group:development/guests
-  system: examples
-  definition: |
-    syntax = "proto3";
-
-    service Exampler {
-      rpc Example (ExampleMessage) returns (ExampleMessage) {};
-    }
-
-    message ExampleMessage {
-      string example = 1;
-    };
diff --git a/workspaces/scorecard/examples/components/github-scorecard-only.yaml b/workspaces/scorecard/examples/components/github-scorecard-only.yaml
index 92ab19d9a4..815e160c1a 100644
--- a/workspaces/scorecard/examples/components/github-scorecard-only.yaml
+++ b/workspaces/scorecard/examples/components/github-scorecard-only.yaml
@@ -1,9 +1,7 @@
----
-# Component with GitHub Scorecard only
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: github-scorecard-only-service
+  name: github-scorecard-only
   annotations:
     github.com/project-slug: redhat-developer/rhdh-plugins
     backstage.io/source-location: url:https://github.com/redhat-developer/rhdh-plugins
diff --git a/workspaces/scorecard/examples/components/jira-scorecard-only.yaml b/workspaces/scorecard/examples/components/jira-scorecard-only.yaml
index 679d232590..864baa2e56 100644
--- a/workspaces/scorecard/examples/components/jira-scorecard-only.yaml
+++ b/workspaces/scorecard/examples/components/jira-scorecard-only.yaml
@@ -1,9 +1,7 @@
----
-# Component with Jira Scorecard only
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: jira-scorecard-only-service
+  name: jira-scorecard-only
   annotations:
     jira/project-key: RSPT
 spec:
diff --git a/workspaces/scorecard/examples/components/no-scorecards.yaml b/workspaces/scorecard/examples/components/no-scorecards.yaml
index 779efb4e06..692fe5e037 100644
--- a/workspaces/scorecard/examples/components/no-scorecards.yaml
+++ b/workspaces/scorecard/examples/components/no-scorecards.yaml
@@ -1,9 +1,7 @@
----
-# Component with no Scorecards
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: no-scorecards-service
+  name: no-scorecards
 spec:
   type: service
   owner: group:development/guests
diff --git a/workspaces/scorecard/examples/components/openssf-scorecard-only.yaml b/workspaces/scorecard/examples/components/openssf-scorecard-only.yaml
index 01825a999d..4ae4cac81d 100644
--- a/workspaces/scorecard/examples/components/openssf-scorecard-only.yaml
+++ b/workspaces/scorecard/examples/components/openssf-scorecard-only.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/workspaces/scorecard/examples/components/sonarqube-scorecard-only.yaml b/workspaces/scorecard/examples/components/sonarqube-scorecard-only.yaml
index 2474fbe4fd..1d987da1c9 100644
--- a/workspaces/scorecard/examples/components/sonarqube-scorecard-only.yaml
+++ b/workspaces/scorecard/examples/components/sonarqube-scorecard-only.yaml
@@ -1,5 +1,3 @@
----
-# Component with SonarQube Scorecard only
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata: