fix tagging, define environment var