According to Bloomberg, Japan is aiming to have 40,000 hydrogen-powered cars on its roads by 2020, with plans for a 20-fold expansion to 800,000 by 2030. These figures come from a report released by the Ministry of Economy, Trade and Industry, outlining the future use of hydrogen and fuel cells.

The country, whose prime minister has vowed to turn it into a “hydrogen society” as a way to diversify energy sources and cut carbon dioxide emissions, currently has about 400 fuel-cell vehicles and about 80 hydrogen stations either operating or soon to operate, according to the report, which was revised from an earlier version released in June 2014.

Japan also plans to double the number of hydrogen stations to about 160 by the time the fiscal year ends in March 2021, boosting that to 320 in the following five years. Japan’s fiscal year begins in April.