Where to park $16k if I believe in electric vehicles and electric vehicle charging exploding sooner than later

With everything going on in Ukraine, along with global warming, [need the list continue?] I think the debate is over that electric vehicles are going to be a majority of vehicles on the road by 2030. This once far out belief that electric vehicles will be a majority is going to become a reality. GM even has pledged to not produce any more vehicles with a tailpipe emission by 2035.

Now, I have not done my hundreds of hours of research like I have done in other areas – so please guide me to what to invest in as far as stocks/etfs go for both electric vehicles and electric vehicles charging?

My current electric vehicle holdings are only Tesla (TSLA) and Global X Autonomous And Electric Vehicles ETF (DRIV). Sold my NIO stocks recently because I just do not know about investing in Chinese stocks.

By all means provide any indirect etfs/stocks that will benefit as electric vehicle sales soar. Such as what materials are required to make the batteries in an electric vehicle.