Added environment to trigger pipework wait