diff --git a/templates/backstage-configmap.yaml b/templates/backstage-configmap.yaml
index ea8715a..6f84798 100644
--- a/templates/backstage-configmap.yaml
+++ b/templates/backstage-configmap.yaml
@@ -95,11 +95,19 @@ data:
         entityFilename: catalog-info.yaml
         pullRequestBranchName: backstage-integration
       rules:
-        - allow: [Component, System, API, Resource, Location, Template]
+        # Add User and Group to allowed entity kinds
+        - allow: [Component, System, API, Resource, Location, Template, User, Group]
       locations:
+        # Existing templates location
         - type: url
           target: {{ .Values.integrations.gitea.url }}/templates/catalog-info.yaml
 
+        # Add organizational data location
+        - type: url
+          target: {{ .Values.integrations.gitea.url }}/osmos/osmos-org/raw/branch/main/org.yaml
+          rules:
+            - allow: [User, Group]
+
     kubernetes:
       serviceLocatorMethod:
         type: 'multiTenant'