OEM puck system