Merge "Refresh docker image definition"