Updated labels to pass env param in all places necessary