Labor’s political headache over the detention of non-citizens should be resolved by the end of the week, with the Coalition expected to support new laws enabling preventive detention of those who pose a risk to the community.

The laws were drafted to mirror the regime that already applies to convicted terrorists, giving the opposition fewer reasons to oppose them or demand amendments, the government says.