Attempt to fix looping of container-based builds