diff --git a/data/04_groups_tags.yml b/data/04_groups_tags.yml
new file mode 100644
index 0000000..54d6df9
--- /dev/null
+++ b/data/04_groups_tags.yml
@@ -0,0 +1,28 @@
+---
+apiVersion: infrahub.app/v1
+kind: Object
+spec:
+  kind: CoreStandardGroup
+  data:
+    - name: spine_devices
+      description: "All spine switches in the EVPN fabric"
+    - name: leaf_devices
+      description: "All leaf switches in the EVPN fabric"
+    - name: arista_devices
+      description: "All Arista EOS devices"
+---
+apiVersion: infrahub.app/v1
+kind: Object
+spec:
+  kind: BuiltinTag
+  data:
+    - name: evpn-vxlan
+      description: "EVPN-VXLAN fabric device"
+    - name: mlag
+      description: "Device participates in MLAG"
+    - name: l2-vxlan
+      description: "L2 VXLAN enabled VTEP"
+    - name: l3-vxlan
+      description: "L3 VXLAN enabled VTEP (symmetric IRB)"
+    - name: containerlab
+      description: "Containerlab managed device"