Backport bundle-related fixes from v2022
ci-flatdeb-builder always builds bundles, but that doesn't work out too well on v2021.
🟡 v2023.5 entered Soft Feature Freeze, no additional features will be accepted • schedule
ci-flatdeb-builder always builds bundles, but that doesn't work out too well on v2021.