You should pick up some 22.5 rims and tires, do away with those tube type tires. I figure you know this but in case you don’t 22.5 rims are meant to fit 20” spokes and 24.5’s fit 22” spokes.
Notice, the wheel coming off the band bus is a split rim, and the wheels coming off the Saftliner are non-split. The split rims will have a 20" rim with a tube type tire, and the non-splits are 22.5" rim with a tubeless tire.