This should avoid issue described in https://github.com/docker/build-push-action/issues/820. Refs #5815