Add role index
Add cleanup role
Add swap space