Abstract away the package manager service workaround

(hopefully this can be fixed later in a nicer way)