publish: More image-fixes

generated from commit 7e6d5067a60429bc62bfc44f5ce8a08fa7f00ef0