Add arm capability without pushing and building images

What does this MR do and why?

Adds back reverted changes but removes arm image builds and pushes for now. The changes in the mr are still quite useful, so we can figure out how to properly publish images at later stage.