The thesis was done to improve Metalpower Oy ’s machine shop new workspaces by introducing the 5S system, which is part of the Lean management philosophy. The main goal and purpose of this thesis was to improve the productivity of the workplaces by using the 5S system. 5S system includes eliminating all non-value-producing activities, avoiding all kinds of waste, and creating visually pleasing work environment that improves the quality of work and occupational safety. Workstations were cleaned and unnecessary materials and tools were removed. The tools need-ed for the job were standardized by assigning their own places on the tool walls or cabinets. Mi-nor layout changes were made to eliminate more unnecessary waste. In order to maintain the 5S system, weekly inspection visits were introduced to maintain the 5S system.