Reverted to debian solution (because it's working)