diff --git a/monitoring/icinga2/conf.d/groups.conf b/monitoring/icinga2/conf.d/groups.conf
index f842523..1ea3849 100644
--- a/monitoring/icinga2/conf.d/groups.conf
+++ b/monitoring/icinga2/conf.d/groups.conf
@@ -29,3 +29,43 @@ object ServiceGroup "disk" {
 
   assign where match("disk*", service.check_command)
 }
+
+object ServiceGroup "openwrt" {
+  display_name = "openwrt APs"
+
+  assign where "openwrt" in host.vars.groups
+}
+
+object ServiceGroup "vocsw" {
+  display_name = "Video Team switches"
+
+  assign where "vocsw" in host.vars.groups
+}
+
+object ServiceGroup "ciscosw" {
+  display_name = "CISCO Switches"
+
+  assign where "ciscosw" in host.vars.groups
+}
+
+object HostGroup "vocsw" {
+  display_name = "Video Team switches"
+
+  assign where "vocsw" in host.vars.groups
+}
+
+object HostGroup "ciscosw" {
+  display_name = "CISCO Switches"
+
+  assign where "ciscosw" in host.vars.groups
+}
+
+object HostGroup "phones" {
+  display_name = "Telephones"
+  assign where "phone" in host.vars.groups
+}
+
+object HostGroup "wifi" {
+  display_name = "Access points"
+  assign where "openwrt" in host.vars.groups
+}