diff --git a/hobo/agent/common/migrations/0004_alter_role_uuid.py b/hobo/agent/common/migrations/0004_alter_role_uuid.py
new file mode 100644
index 0000000..8e82d48
--- /dev/null
+++ b/hobo/agent/common/migrations/0004_alter_role_uuid.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-06-08 08:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0003_auto_20200707_1656'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='role',
+            name='uuid',
+            field=models.CharField(db_index=True, max_length=32),
+        ),
+    ]
diff --git a/hobo/agent/common/models.py b/hobo/agent/common/models.py
index 61312f9..c7c8568 100644
--- a/hobo/agent/common/models.py
+++ b/hobo/agent/common/models.py
@@ -4,7 +4,7 @@ from django.db import models
 
 
 class Role(Group):
-    uuid = models.CharField(max_length=32)
+    uuid = models.CharField(max_length=32, db_index=True)
     description = models.TextField(default=u'')
     details = models.TextField(default=u'')
     emails = ArrayField(models.CharField(max_length=128), default=list)