Merge "Add config files for queens"