Ported rescue to new docker builder