shamu: adjust apk handling