diff --git a/infrahub/.infrahub.yml b/infrahub/.infrahub.yml
index 2ad7b54..d499526 100644
--- a/infrahub/.infrahub.yml
+++ b/infrahub/.infrahub.yml
@@ -1,8 +1,12 @@
 # yaml-language-server: $schema=https://schema.infrahub.app/python-sdk/repository-config/latest.json
 ---
 # Infrahub Repository Configuration
-# This file defines generators and queries for datacenter automation
 
+# Define where schemas are located
+schemas:
+  - schemas/*.yml
+
+# Generator definitions
 generator_definitions:
   - name: datacenter_generator
     file_path: "generators/datacenter_generator.py"
@@ -13,6 +17,7 @@ generator_definitions:
     parameters:
       datacenter_id: "id"
 
+# GraphQL queries
 queries:
   - name: datacenter_query
-    file_path: "generators/datacenter_query.gql"
\ No newline at end of file
+    file_path: "generators/datacenter_query.gql"
diff --git a/infrahub/schema/01_organization.yml b/infrahub/schemas/01_organization.yml
similarity index 100%
rename from infrahub/schema/01_organization.yml
rename to infrahub/schemas/01_organization.yml
diff --git a/infrahub/schema/02_ipam.yml b/infrahub/schemas/02_ipam.yml
similarity index 100%
rename from infrahub/schema/02_ipam.yml
rename to infrahub/schemas/02_ipam.yml
diff --git a/infrahub/schema/03_datacenter.yml b/infrahub/schemas/03_datacenter.yml
similarity index 100%
rename from infrahub/schema/03_datacenter.yml
rename to infrahub/schemas/03_datacenter.yml
diff --git a/infrahub/schema/04_device.yml b/infrahub/schemas/04_device.yml
similarity index 100%
rename from infrahub/schema/04_device.yml
rename to infrahub/schemas/04_device.yml
diff --git a/infrahub/schema/05_interfaces.yml b/infrahub/schemas/05_interfaces.yml
similarity index 100%
rename from infrahub/schema/05_interfaces.yml
rename to infrahub/schemas/05_interfaces.yml
diff --git a/infrahub/schema/06_vlan_vrfs.yml b/infrahub/schemas/06_vlan_vrfs.yml
similarity index 100%
rename from infrahub/schema/06_vlan_vrfs.yml
rename to infrahub/schemas/06_vlan_vrfs.yml
diff --git a/infrahub/schema/07_bgp.yml b/infrahub/schemas/07_bgp.yml
similarity index 100%
rename from infrahub/schema/07_bgp.yml
rename to infrahub/schemas/07_bgp.yml
diff --git a/infrahub/schema/08_mlag_evpn_vxlan.yml b/infrahub/schemas/08_mlag_evpn_vxlan.yml
similarity index 100%
rename from infrahub/schema/08_mlag_evpn_vxlan.yml
rename to infrahub/schemas/08_mlag_evpn_vxlan.yml
diff --git a/infrahub/schema/09_routing_policies.yml b/infrahub/schemas/09_routing_policies.yml
similarity index 100%
rename from infrahub/schema/09_routing_policies.yml
rename to infrahub/schemas/09_routing_policies.yml
diff --git a/infrahub/schema/10_dci.yml b/infrahub/schemas/10_dci.yml
similarity index 100%
rename from infrahub/schema/10_dci.yml
rename to infrahub/schemas/10_dci.yml