diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index 23c39390d0..548dabd87b 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -90,28 +90,26 @@ catalog:
   rules:
     - allow: [Component, System, API, Resource, Location]
   locations:
-    # Backstage example components
+    # Local example data, file locations are relative to the backend process, typically `packages/backend`
     - type: file
-      target: ../../examples/all-components.yaml
+      target: ../../examples/entities.yaml
 
-    # Backstage example systems
+    # Local example template
     - type: file
-      target: ../../examples/all-systems.yaml
-
-    # Backstage example APIs
-    - type: file
-      target: ../../examples/all-apis.yaml
-
-    # Backstage example resources
-    - type: file
-      target: ../../examples/all-resources.yaml
-
-    # Backstage example organization groups
-    - type: file
-      target: ../../examples/acme/org.yaml
-
-    # Backstage example templates
-    - type: file
-      target: ../../examples/all-templates.yaml
+      target: ../../examples/template/template.yaml
       rules:
-        - allow: [Template]
+      - allow: [Template]
+
+    # Local example organizational data
+    - type: file
+      target: ../../examples/org.yaml
+      rules:
+      - allow: [User, Group]
+
+    ## Uncomment these lines to add more example data
+    # - type: url
+    #   target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all.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
diff --git a/packages/create-app/templates/default-app/examples/org.yaml b/packages/create-app/templates/default-app/examples/org.yaml
new file mode 100644
index 0000000000..ef4e1aea91
--- /dev/null
+++ b/packages/create-app/templates/default-app/examples/org.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: backstage.io/v1alpha1
+# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-user
+kind: User
+metadata:
+  name: guest
+spec:
+  memberOf: [guests]
+---
+apiVersion: backstage.io/v1alpha1
+# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-group
+kind: Group
+metadata:
+  name: guests
+spec:
+  type: squad
+  children: []