Some images might take longer build

Make sure we can wait more than 60s
Using a dict to iterate orver tuple of static values is overkill