Move out software-properties-common dependency
Add an upgrade for non-security updates