Moving to apt-get based approach