In the assembly of optical resonators of optically pumped semiconductor lasers (OPSL), the highly reflective resonator mirror is the most crucial component. In previous cooperation, Coherent and Fraunhofer IPT have developed a robust active alignment strategy to optimize the output power of the OPSL resonator using search strategies for finding the laser threshold as well as hill-climbing algorithms for maximizing the output power. Beam-shape as well as the laser mode have major influence on the quality and the duration of subsequent beam-shaping and fiber-coupling steps. Therefore, the alignment algorithm optimizing the output power has been extended recently by simultaneous image processing for ensuring a Gaussian beam as the result of alignment. The paper describes the enhanced approach of automated alignment by additionally scanning along the optical resonator and subsequently evaluating and optimizing the roundness of the beam as well as minimizing the beam radius through twisting and tilting of the mirror. A quality metric combining these measures is defined substituting an M² measurement. The paper also describes the approach for automated assembly including the measuring setup, micromanipulation and dispensing devices.