I plan to talk about the following two related problems: Zariski's local uniformization of algebraic varieties and local description of Berkovich analytic spaces. The main accent will be on the second problem and some recent progress.