Merge "Update docker tag convention"