Move run -rm to the cli only Upstream-commit: 31fd11860b871ef9504a3d9d4c339e872cfa1822 Component: engine