diff --git a/app-config.yaml b/app-config.yaml
index 00e2492e2d..9b0a9ee1d0 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -254,6 +254,11 @@ catalog:
     # Backstage example entities
     - type: file
       target: ../catalog-model/examples/all.yaml
+    # Backstage example groups and users
+    - type: file
+      target: ../catalog-model/examples/acme-corp.yaml
+      rules:
+        - allow: [User, Group]
     # Example component for github-actions and TechDocs
     - type: file
       target: ../../plugins/github-actions/examples/sample.yaml
@@ -263,13 +268,6 @@ catalog:
     # Backstage example templates
     - type: file
       target: ../../plugins/scaffolder-backend/sample-templates/all-templates.yaml
-    # Backstage example groups and users
-    - type: file
-      target: ../catalog-model/examples/acme-corp.yaml
-      rules:
-      - allow:
-          - User
-          - Group
     # Backstage end-to-end tests of TechDocs
     - type: file
       target: ../../cypress/e2e-fixture.catalog.info.yaml
diff --git a/packages/catalog-model/examples/all.yaml b/packages/catalog-model/examples/all.yaml
index 75eb0b097d..1101a60ef9 100644
--- a/packages/catalog-model/examples/all.yaml
+++ b/packages/catalog-model/examples/all.yaml
@@ -2,7 +2,7 @@ apiVersion: backstage.io/v1alpha1
 kind: Location
 metadata:
   name: example-apis
-  description: A collection of all Backstage example APIs
+  description: A collection of all Backstage example entities, except users, groups, and templates
 spec:
   targets:
     - ./all-apis.yaml
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 548dabd87b..b889960329 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -98,13 +98,13 @@ catalog:
     - type: file
       target: ../../examples/template/template.yaml
       rules:
-      - allow: [Template]
+        - allow: [Template]
 
     # Local example organizational data
     - type: file
       target: ../../examples/org.yaml
       rules:
-      - allow: [User, Group]
+        - allow: [User, Group]
 
     ## Uncomment these lines to add more example data
     # - type: url
@@ -113,3 +113,5 @@ catalog:
     ## 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]
diff --git a/packages/create-app/templates/default-app/examples/entities.yaml b/packages/create-app/templates/default-app/examples/entities.yaml
index 22e826d9ec..447e8b1f34 100644
--- a/packages/create-app/templates/default-app/examples/entities.yaml
+++ b/packages/create-app/templates/default-app/examples/entities.yaml
@@ -1,14 +1,14 @@
 ---
-apiVersion: backstage.io/v1alpha1
 # https://backstage.io/docs/features/software-catalog/descriptor-format#kind-system
+apiVersion: backstage.io/v1alpha1
 kind: System
 metadata:
   name: examples
 spec:
   owner: guests
 ---
-apiVersion: backstage.io/v1alpha1
 # https://backstage.io/docs/features/software-catalog/descriptor-format#kind-component
+apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
   name: example-website
@@ -19,8 +19,8 @@ spec:
   system: examples
   providesApis: [example-grpc-api]
 ---
-apiVersion: backstage.io/v1alpha1
 # https://backstage.io/docs/features/software-catalog/descriptor-format#kind-api
+apiVersion: backstage.io/v1alpha1
 kind: API
 metadata:
   name: example-grpc-api
diff --git a/packages/create-app/templates/default-app/examples/org.yaml b/packages/create-app/templates/default-app/examples/org.yaml
index ef4e1aea91..a10e81fc7f 100644
--- a/packages/create-app/templates/default-app/examples/org.yaml
+++ b/packages/create-app/templates/default-app/examples/org.yaml
@@ -1,17 +1,17 @@
 ---
-apiVersion: backstage.io/v1alpha1
 # https://backstage.io/docs/features/software-catalog/descriptor-format#kind-user
+apiVersion: backstage.io/v1alpha1
 kind: User
 metadata:
   name: guest
 spec:
   memberOf: [guests]
 ---
-apiVersion: backstage.io/v1alpha1
 # https://backstage.io/docs/features/software-catalog/descriptor-format#kind-group
+apiVersion: backstage.io/v1alpha1
 kind: Group
 metadata:
   name: guests
 spec:
-  type: squad
+  type: team
   children: []