NHK has learned that the Japanese government plans to set new targets to speed the country's transition to eco-friendly vehicles.
Sources say officials will target a five-fold increase in the number of EV charging points to 150,000 by 2030.
And they want to boost the number of hydrogen stations for fuel-cell vehicles by around six-fold to 1,000 units.
Officials will aim to have electric-powered models make up between 20 and 30 percent of new small commercial vehicles.
The government also wants to make all such vehicles either electric-powered, or using synthetic fuels by 2040.
EVs and fuel-cell vehicles currently account for less than one percent of new automobiles sold in Japan.