[Fix] Typo in yaml
[Fix] port definition
[Fix] Bundle calls
[Upg] Simplify dist-upgrade