Merge "Fix docker tags"