Elon Musk hopes next month to unveil new residential solar panels, home battery packs and car chargers under both the Tesla and SolarCity brands.

“Aiming for Oct. 28 unveil in SF Bay Area of new Tesla/SolarCity solar roof with integrated Powerwall 2.0 battery and Tesla charger,” the tech billionaire tweeted Thursday afternoon.

In a “Master Plan” published in late July, Musk said he wanted to manufacture “a smoothly integrated and beautiful solar-roof-with-battery product that just works.”

Last year, however, Tesla execs had admitted that the first Powerwall battery didn’t yet work well with rooftop solar panels and wasn’t ready for daily use.

The dual-brand announcement comes as Musk is battling shareholder lawsuits challenging his proposal to merge his Tesla and SolarCity companies in a $2.6 billion deal.

Critics say the merger is riddled with conflicts of interest, with Musk wielding outsize influence over the boards of both companies. Critics also fret that the deal would create a money-losing and dangerously debt-laden company.