[#48453367] Only store app_env on wats
Minor fixes