diff --git a/hosts b/hosts
index cd0d23d..09e8604 100644
--- a/hosts
+++ b/hosts
@@ -1,11 +1,27 @@
 [new-office]
 
-[general-use]
-caffeine.csclub.uwaterloo.ca
+[bare-metal:children]
+general-use-bare-metal
+syscom-bare-metal
+mirror
+audio-sink
+
+[containers:children]
+general-use-containers
+syscom-containers
+
+[general-use:children]
+general-use-bare-metal
+general-use-containers
+
+[general-use-bare-metal]
 corn-syrup.csclub.uwaterloo.ca
 hfcs.csclub.uwaterloo.ca
 sucrose.csclub.uwaterloo.ca
 taurine.csclub.uwaterloo.ca
+
+[general-use-containers]
+caffeine.csclub.uwaterloo.ca
 caffeine-00.csclub.uwaterloo.ca
 caffeine-01.csclub.uwaterloo.ca
 
@@ -16,34 +32,32 @@ maltodextrin.csclub.uwaterloo.ca
 natural-flavours.csclub.uwaterloo.ca
 strombola.csclub.uwaterloo.ca
 
-[syscom]
+[syscom:children]
+syscom-bare-metal
+syscom-containers
+
+[syscom-bare-metal]
 aspartame.csclub.uwaterloo.ca
 dextrose.csclub.uwaterloo.ca
-auth1.csclub.uwaterloo.ca
-auth2.csclub.uwaterloo.ca
 cobalamin.csclub.uwaterloo.ca
 glomag.csclub.uwaterloo.ca
-mail.csclub.uwaterloo.ca
 potassium-benzoate.csclub.uwaterloo.ca
-munin.csclub.uwaterloo.ca
-rt.csclub.uwaterloo.ca
-netbox.csclub.uwaterloo.ca
 sodium-benzoate.csclub.uwaterloo.ca
 yerba-mate.csclub.uwaterloo.ca
 guayusa.csclub.uwaterloo.ca
 sandstorm.csclub.uwaterloo.ca
 
-[audio-sink]
-nullsleep.csclub.uwaterloo.ca
-
-[containers]
+[syscom-containers]
 auth1.csclub.uwaterloo.ca
 auth2.csclub.uwaterloo.ca
 mail.csclub.uwaterloo.ca
 munin.csclub.uwaterloo.ca
 rt.csclub.uwaterloo.ca
 netbox.csclub.uwaterloo.ca
-caffeine.csclub.uwaterloo.ca
+logstash.csclub.uwaterloo.ca
+
+[audio-sink]
+nullsleep.csclub.uwaterloo.ca
 
 [mirror]
 potassium-benzoate.csclub.uwaterloo.ca