Police chiefs plan to stop sending criminals to cells and hold them in “modern, safe places” instead.
The Scottish Police Authority (SPA) wants to revamp holding facilities and change their image from being bare and dingy.
However, critics say the scheme risks prioritising criminals over protecting the public.
The plans were revealed in the SPA’s annual Police Plan, which says custody areas will change “from places of detention to modern, safe places and gateways for the delivery of wellbeing, diversion and transformation services.”
Chief Constable Iain Livingstone states: “I see us as providing a national holistic service of safety and security just as the NHS provides a national service of healthcare.
“Meaningful change requires persistent focus and leadership. An independent review group with a wide range of voices will provide additional scrutiny and oversight to our intense focus on equality, diversity and inclusion imperatives.”
But Scottish Tories’ justice spokesman Jamie Greene said the plans were likely to have the public asking: “What about the wellbeing of victims?”
He added: “Police cells should be used to keep the public safe from potentially dangerous criminals – it’s not a hotel.
“The public will rightly wonder where the priorities are when we know so many calls to the police take too long to be answered.
"The Scottish Conservatives will put victims of crime, not criminals, at the heart of the justice system by introducing our Victims Bill.”
Don't miss the latest news from around Scotland and beyond - Sign up to our daily newsletter here .
