Maintenance plays a main role in the efficient functioning of the CNC machine; this thesis focuses on the enhancement of the components that faces the most common failure modes that effects the functioning of the CNC machines. Three main components are selected to be enhanced and analysed in this thesis which are lubrication system, spindle bearings, and ball screw and linear guide. By the help of maintenance strategies, manufacturing and design process, material studies, and finite element analysis, several enhancement and solutions have been done to solve the most critical problems applied on those components.