[#48737855] Make the bootstrap match what puppet does