Related #2097
Description
Make the necessary changes for multi-architecture construction that have been detected in the indicated spike.
Functional requirements
Implementation restriction
Multi-platform images must behave identically to the current Intel-only images (same base image, entrypoints, environment variables, config behavior).