Keep track of container and image ids better for commit