diff --git a/turnstone/core/storage/_postgresql.py b/turnstone/core/storage/_postgresql.py
index 61cd0ddf..024707ef 100644
--- a/turnstone/core/storage/_postgresql.py
+++ b/turnstone/core/storage/_postgresql.py
@@ -1363,21 +1363,7 @@ class PostgreSQLBackend:
                 .select_from(user_roles.join(roles, user_roles.c.role_id == roles.c.role_id))
                 .where(user_roles.c.user_id == user_id)
             ).fetchall()
-            return [
-                {
-                    "role_id": r[0],
-                    "name": r[1],
-                    "display_name": r[2],
-                    "permissions": r[3],
-                    "builtin": bool(r[4]),
-                    "org_id": r[5],
-                    "created": r[6],
-                    "updated": r[7],
-                    "assigned_by": r[8],
-                    "assignment_created": r[9],
-                }
-                for r in rows
-            ]
+            return [_row_to_dict(r, "builtin") for r in rows]
 
     def get_user_permissions(self, user_id: str) -> set[str]:
         with self._engine.connect() as conn:
diff --git a/turnstone/core/storage/_sqlite.py b/turnstone/core/storage/_sqlite.py
index 071ee42e..57f325ad 100644
--- a/turnstone/core/storage/_sqlite.py
+++ b/turnstone/core/storage/_sqlite.py
@@ -1401,21 +1401,7 @@ class SQLiteBackend:
                 .select_from(user_roles.join(roles, user_roles.c.role_id == roles.c.role_id))
                 .where(user_roles.c.user_id == user_id)
             ).fetchall()
-            return [
-                {
-                    "role_id": r[0],
-                    "name": r[1],
-                    "display_name": r[2],
-                    "permissions": r[3],
-                    "builtin": bool(r[4]),
-                    "org_id": r[5],
-                    "created": r[6],
-                    "updated": r[7],
-                    "assigned_by": r[8],
-                    "assignment_created": r[9],
-                }
-                for r in rows
-            ]
+            return [_row_to_dict(r, "builtin") for r in rows]
 
     def get_user_permissions(self, user_id: str) -> set[str]:
         with self._engine.connect() as conn: