Merge "Update controller image label to new format"