diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c5436d..72a121d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ 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.9](https://github.com/PerimeterX/envite/compare/v0.0.8...v0.0.9)
+
+### Fixed
+
+- Cleanup phase failed when using the same image for multiple components due to a failure in removing the image  
+more than once. To fix this - ignored that specific issue "reference does not exist" when that error is returned   
+from the docker remove request
+
 ## [0.0.8](https://github.com/PerimeterX/envite/compare/v0.0.7...v0.0.8)
 
 ### Added
diff --git a/docker/component.go b/docker/component.go
index 28238ce..15c1866 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 {
+	if err != nil && !strings.Contains(err.Error(), "reference does not exist") {
 		return err
 	}