Volvo Construction Equipment has for a few years worked on improving the work environment and ergonomic conditions for its employees. Changes can be seen in their process department and the work has now reached the maintenance and tools storage. The objectives of this thesis was to map the current state of the storage and see if the workplace and tasks can be designed for a safer material handling. The aim was to deliver two sets of solutions, a short-term one with acceptable requirement fulfillment and a long-term one where the requirements are achieved at a higher level.The process of this thesis has followed a project circle of seven phases in an iterative manner, in order to acquire a reliable and valid foundation for the development of the two solutions. Relevant areas for the theoretical framework were identified by looking further into the project’s research questions. Which included work environment, risks and safety, ergonomics, order-picking performance in relation to ergonomics interventions and ergonomic design principles. The mapping and analysis of the current state resulted in a requirement specification for the conceptual solutions.The results showed that the maintenance and tools storage at Volvo CE handles a wide range of materials. Materials can be anything from gloves weighing a few grams to spare engines of 30-50 kg. Everything is being handled manually. The storage is of two floors, its layout and shelving system has the employees work in unnatural and uncomfortable postures e.g. twisted and bent torsos, work above the shoulder and work below the knees. Other identified problems are the lack of space and the uneven workload in the storage. Consequently, the personnel are exposed to risks for physical and mental strain. The concept development has therefore, focused on minimalizing the manual material handling as well as on improving the physical and psychosocial environment of the workplace. The company is recommended to, as quick-fix actions, inspect what materials are needed and dispose those that are not. A rearrangement of the material on the shelves should also be carried through. Other recommendations are installment of lifting equipment and the introduction of rotational work stations. The company is however, recommended to continue with the mapping and analysis of the psychosocial environment to increase the success level of rotational work stations. Lastly, implementation of a scanning system has the potential to solve the problems on a long term aspect and therefore worth to look further into for an overall improved working environment.