Change Environment Detection to standard APP_ENV