diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index 430933bbf0..0877e27878 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -134,7 +134,7 @@ func (b *defaultBuilder) submit(request Request) {
 		r.Error = err
 	}
 
-	os.RemoveAll(builderPath)
+	defer os.RemoveAll(builderPath)
 
 	// update the cache
 	b.request.Store(request.Identifier, r)