diff --git a/infinitory/inventory.py b/infinitory/inventory.py
index 0f0b6d6..fbae118 100644
--- a/infinitory/inventory.py
+++ b/infinitory/inventory.py
@@ -63,7 +63,7 @@ class Inventory(object):
     def load_roles(self, pdb):
         self.roles = defaultdict(list)
 
-        condition = 'type = "Profile::Motd::Register" and file ~ "/site[.]pp$"'
+        condition = 'type = "Class" and title ~ "^Role::"'
         for node, resource in self.query_resources(pdb, condition):
             if resource["title"] not in ("role", "role::delivery"):
                 node["other"]["roles"].append(resource["title"])
diff --git a/setup.py b/setup.py
index 457463d..7cc9a52 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name = "infinitory",
-    version = "0.0.5",
+    version = "0.0.6",
 
     description = "SRE host, role, and service inventory",
     author = "Daniel Parks",