Docker: Also add cleanup