Changing env vars to regular variables