replaced pipeline-based solution by env-based one