Removing environment variable KEEPWORKDIR and adding command line option --no-clean-up