Merge "Align Docker versions with manifest file"