Use "on-failure" for both containers and services Upstream-commit: ace1f176fec38232b78114b2feb8609590481221 Component: engine