UHM-956 Update environment variables