This thesis deals with the risk assessment of machinery, specifically the automated bartender model. The thesis includes the replacement of a pneumatic feeder with an electric linear conveyor using MagneMotion technology. The theoretical part of the thesis describes the automated bartender model, MagneMotion independent trolley technology and GuardLink safety technology. This is followed by the development of a risk assessment on the machinery according to ČSN EN ISO 12 100. The next part of the thesis describes the design and implementation of conveyor replacement and safety measures to reduce the risks resulting from the risk assessment. Finally, the implemented safety measures are verified