Merge "Update images tag and nexus registry port"