Demand for fuel has spiked by a third during the Easter break as Australia secures more petrol and diesel.
The nation had supply until mid-April, but more orders have been locked in, Energy Minister Chris Bowen said.
"We now have security of supply through April and now into May," he told reporters in Sydney on Monday.
"But as we've indicated on multiple occasions, we recognise that it's a difficult international environment and there are risks to supply chains as long as the Strait of Hormuz remains closed."
Mr Bowen said fuel companies reported demand during Easter had been 30 per cent higher than the previous one.
"If you're storing fuel at home, that's very dangerous," he said.
"It's not recommended and it doesn't help the situation, it makes the situation worse for all of us."
In NSW, 142 out of 2400 service stations are without diesel, slightly down on Sunday's figures.
Thirty-nine servos have no fuel.
Mr Bowen said 3.7 billion litres of different types of fuel were on their way to Australia.
Consumers are being warned to expect higher prices at the supermarket checkout and the bowser for months to come.
Relief has begun to flow after the federal government temporarily halved taxes on petrol and diesel, while states agreed to pass on an expected GST windfall because of higher takings on sales.
But the combined savings, worth more than 30c per litre, have not offset the full impact of high global oil prices due to the trickle of ships carrying supplies coming through the Strait of Hormuz, which has been closed by Iran.
It would take a while for supply chains to be restored to their pre-war states even after the US-Israeli conflict with Iran ended, University of Sydney associate economics professor David Ubilava said.
"The market disruption and the war has dragged on long enough that its effects will be felt for months to come," he told AAP.
"Not only will the price of fuel go up, but so will transportation costs and, as a result of fuel surcharges, deliveries, groceries and restaurants will become more expensive as those costs are passed onto the consumer."
US President Donald Trump has flagged strikes on Iran could end within weeks, recently saying core objectives were nearing completion.
In an expletive-laden social media post, Mr Trump threatened Iran to open the "F***in' Strait" or the regime will be "living in Hell".
The Albanese government has accepted the impacts of the war will continue, even if it comes to a swift end.
Assistant Foreign Affairs Minister Matt Thistlethwaite on Sunday said the flow-on effects on fuel prices and inflation would have a long tail.
"If (the war) ended tomorrow, there'd still be effects in the coming months, but we're planning for that," he said.
Prof Ubilava said while the volatile situation made forecasting difficult, it was hard to see the crude oil price - currently close to $A159 per barrel - returning to pre-war levels of about $A101.
