IDEX-1057 corrected environment configuration for some samples