build: Rebase after cirros bump / GPG addition