The Oregon fire marshal’s temporary rule change allowing motorists to pump their own gas — without assistance — will expire at midnight Saturday, May 23.

That means beginning Sunday, May 24, attendants will be required at most Oregon gas stations. Self-service will continue in parts of rural Oregon, where it has been lawful to pump gas without help since lawmakers changed the rules in 2017.

“We want to thank Oregonians and the many Oregon businesses who provide gasoline for their patience as we allowed for voluntary self-service at Oregon gas stations where that service had not been available before,” said State Fire Marshal Jim Walker.

The Oregon Fuels Association had requested the change due to labor shortages, and to allow remaining workers to focus on sanitization and social distancing measures.

“We appreciate the leadership from Governor Brown and the Office of the State Fire Marshal in providing flexibility to Oregon’s locally-owned fuel stations during this very challenging time,” said Danelle Romain, a lobbyist for the association. “As we transition to a new normal, ensuring public safety and fuel availability will remain our priorities.”