Add env vars and remove blueprint/tyography