Merge "Fixing tags on ONF demo pod"