Change name of env vars to propagate
Remove some unneeded dashboard vars