Bug 989274 - Update to new image and simplify commands as the result