CHATTANOOGA (WRCB) - Tennessee leaders hope to make the wait at driver service centers a little shorter.

The Department of Safety and Homeland Security is installing new self-service kiosks across the state.

Citizens may renew or replace non-commercial driver licenses and state ID cards at the machines.

In Hamilton County, a kiosk has been set up at the Bonny Oaks Driver Service Center.