diff --git a/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml b/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
index 72d80a3..7eb1d36 100644
--- a/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
+++ b/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
@@ -7,7 +7,7 @@ metadata:
     argocd/app-name: ${{values.name | dump}}
 spec:
   type: s3-bucket
-  owner: guest
+  owner: guests
 ---
 apiVersion: backstage.io/v1alpha1
 kind: Component
@@ -24,7 +24,7 @@ metadata:
       title: Repo URL
       icon: github
 spec:
-  owner: guest
+  owner: guests
   lifecycle: experimental
   type: service
   system: ${{values.name | dump}}
@@ -43,6 +43,6 @@ metadata:
       title: CNOE Repo
       icon: github
 spec:
-  owner: guest
+  owner: guests
   lifecycle: experimental
   type: service
diff --git a/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml b/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
index f2fc060..7627951 100644
--- a/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
+++ b/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: app-with-aws-resources
   title: Add a Go App with AWS resources
 spec:
-  owner: guest
+  owner: guests
   type: service
   parameters:
     - properties:
diff --git a/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml b/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
index 6324717..0cf6405 100644
--- a/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
+++ b/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
@@ -18,7 +18,7 @@ metadata:
       title: Repo URL
       icon: github
 spec:
-  owner: guest
+  owner: guests
   lifecycle: experimental
   type: service
   system: ${{values.name | dump}}
@@ -35,6 +35,6 @@ metadata:
       title: CNOE Repo
       icon: github
 spec:
-  owner: guest
+  owner: guests
   lifecycle: experimental
   type: service
diff --git a/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml b/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
index fb41bec..985c97b 100644
--- a/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
+++ b/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: argo-workflows-basic
   title: Basic Argo Workflow with a Spark Job
 spec:
-  owner: guest
+  owner: guests
   type: service
   parameters:
     - title: Configuration Options
diff --git a/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml b/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
index 8893792..c4dec95 100644
--- a/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
+++ b/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
@@ -14,7 +14,7 @@ metadata:
       title: Repo URL
       icon: github
 spec:
-  owner: guest
+  owner: guests
   lifecycle: experimental
   type: service
   system: ${{values.name | dump}}
@@ -31,6 +31,6 @@ metadata:
       title: CNOE Repo 
       icon: github
 spec:
-  owner: guest
+  owner: guests
   lifecycle: experimental
   type: service
diff --git a/ref-implementation/backstage-templates/entities/basic/template.yaml b/ref-implementation/backstage-templates/entities/basic/template.yaml
index dd0d173..f75743b 100644
--- a/ref-implementation/backstage-templates/entities/basic/template.yaml
+++ b/ref-implementation/backstage-templates/entities/basic/template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: basic
   title: Create a Basic Deployment
 spec:
-  owner: guest
+  owner: guests
   type: service
   parameters:
     - title: Configuration Options
diff --git a/ref-implementation/backstage-templates/entities/catalog-info.yaml b/ref-implementation/backstage-templates/entities/catalog-info.yaml
index 5dd49eb..f49a7bb 100644
--- a/ref-implementation/backstage-templates/entities/catalog-info.yaml
+++ b/ref-implementation/backstage-templates/entities/catalog-info.yaml
@@ -8,3 +8,12 @@ spec:
     - ./basic/template.yaml
     - ./argo-workflows/template.yaml
     - ./app-with-bucket/template.yaml
+---
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: basic-organization
+  description: Basic organization data
+spec:
+  targets:
+    - ./organization/guests.yaml
diff --git a/ref-implementation/backstage-templates/entities/organization/guests.yaml b/ref-implementation/backstage-templates/entities/organization/guests.yaml
new file mode 100644
index 0000000..b1dddfc
--- /dev/null
+++ b/ref-implementation/backstage-templates/entities/organization/guests.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: guest
+spec:
+  memberOf: [guests]
+---
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: guests
+spec:
+  type: team
+  children: []
diff --git a/ref-implementation/backstage/manifests/install.yaml b/ref-implementation/backstage/manifests/install.yaml
index 56aacdb..5cc31a9 100644
--- a/ref-implementation/backstage/manifests/install.yaml
+++ b/ref-implementation/backstage/manifests/install.yaml
@@ -166,11 +166,8 @@ data:
         # Examples from a public GitHub repository.
         - type: url
           target: https://cnoe.localtest.me/gitea/giteaAdmin/idpbuilder-localdev-backstage-templates-entities/raw/branch/main/catalog-info.yaml
-        ## Uncomment these lines to add an example org
-        # - type: url
-        #   target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
-        #   rules:
-        #     - allow: [User, Group]
+          rules:
+            - allow: [Component, System, API, Resource, Location, Template, User, Group]
     kubernetes:
       serviceLocatorMethod:
         type: 'multiTenant'