Described herein is a system and method for camera module alignment. A camera module comprises a terminal block and an endcap with a connector shroud. The terminal block includes flexible terminal legs connected to a circuit board and terminal pins for connection with an external connector through the connector shroud. The terminal block includes alignment ribs and an endcap includes alignment pockets. Placement of the alignment ribs into the alignment pockets flexes the flexible terminal legs, moves the terminal block across the circuit board surface and aligns the terminal pins for connection with the external connector through the connector shroud.