Change to automatic architecture selection