diff --git a/src/PlaygroundGrains/BuildGrain.cs b/src/PlaygroundGrains/BuildGrain.cs
index 875e29a..877e809 100644
--- a/src/PlaygroundGrains/BuildGrain.cs
+++ b/src/PlaygroundGrains/BuildGrain.cs
@@ -97,10 +97,7 @@ public class BuildGrain : ProcessGrain<BuildRequestDto, BuildResponseDto>, IBuil
         }
         finally
         {
-            if (Directory.Exists(_tempFolder))
-            {
-                Directory.Delete(_tempFolder, true);
-            }
+            DeactivateOnIdle();
         }
 
         return new BuildResponseDto
@@ -109,5 +106,13 @@ public class BuildGrain : ProcessGrain<BuildRequestDto, BuildResponseDto>, IBuil
             Message = "Build failed"
         };
     }
+
+    OnDeactivateAsync()
+    {
+        if (Directory.Exists(_tempFolder))
+        {
+            Directory.Delete(_tempFolder, true);
+        }
+    }
 }
 
diff --git a/src/PlaygroundGrains/TemplateGrain.cs b/src/PlaygroundGrains/TemplateGrain.cs
index 8b1f50b..f59a1b6 100644
--- a/src/PlaygroundGrains/TemplateGrain.cs
+++ b/src/PlaygroundGrains/TemplateGrain.cs
@@ -64,10 +64,7 @@ public class TemplateGrain : ProcessGrain<TemplateRequestDto, TemplateResponseDt
         }
         finally
         {
-            if (Directory.Exists(_tempFolder))
-            {
-                Directory.Delete(_tempFolder, true);
-            }
+            DeactivateOnIdle();
         }
 
         return new TemplateResponseDto
@@ -76,5 +73,13 @@ public class TemplateGrain : ProcessGrain<TemplateRequestDto, TemplateResponseDt
             Message = "Template failed"
         };
     }
+
+    OnDeactivateAsync()
+    {
+        if (Directory.Exists(_tempFolder))
+        {
+            Directory.Delete(_tempFolder, true);
+        }
+    }
 }
 
diff --git a/src/PlaygroundGrains/TestGrain.cs b/src/PlaygroundGrains/TestGrain.cs
index c17a35d..1e2caa9 100644
--- a/src/PlaygroundGrains/TestGrain.cs
+++ b/src/PlaygroundGrains/TestGrain.cs
@@ -70,10 +70,7 @@ public class TestGrain : ProcessGrain<TestRequestDto, TestResponseDto>, ITestGra
         }
         finally
         {
-            if (Directory.Exists(_tempFolder))
-            {
-                Directory.Delete(_tempFolder, true);
-            }
+            DeactivateOnIdle();
         }
 
         return new TestResponseDto
@@ -82,5 +79,13 @@ public class TestGrain : ProcessGrain<TestRequestDto, TestResponseDto>, ITestGra
             Message = "Test failed"
         };
     }
+
+    OnDeactivateAsync()
+    {
+        if (Directory.Exists(_tempFolder))
+        {
+            Directory.Delete(_tempFolder, true);
+        }
+    }
 }