diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72a121d..fdf43c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.10](https://github.com/PerimeterX/envite/compare/v0.0.9...v0.0.10)
+
+### Fixed
+
+- Cleanup phase still failed sometimes after previous fix with different message, now covering both.
+
 ## [0.0.9](https://github.com/PerimeterX/envite/compare/v0.0.8...v0.0.9)
 
 ### Fixed
diff --git a/docker/component.go b/docker/component.go
index 15c1866..716ca3a 100644
--- a/docker/component.go
+++ b/docker/component.go
@@ -255,7 +255,7 @@ func (c *Component) Cleanup(ctx context.Context) error {
 
 func (c *Component) removeImage(ctx context.Context) error {
 	_, err := c.cli.ImageRemove(ctx, c.imageCloneTag, image.RemoveOptions{})
-	if err != nil && !strings.Contains(err.Error(), "reference does not exist") {
+	if err != nil && !strings.Contains(err.Error(), "reference does not exist") && !strings.Contains(err.Error(), "No such image") {
 		return err
 	}