Match machine environment more exactly
Don't tie nginx to observatory