diff --git a/containers/docker.go b/containers/docker.go
index 573983f..5842514 100644
--- a/containers/docker.go
+++ b/containers/docker.go
@@ -338,10 +338,13 @@ func (d *Driver) Create(name string, image string, volumePath string, HTTPPort i
 		}
 	}
 
-	OOMKillDisable := false
-	if memory < 1500 {
-		OOMKillDisable = true
-	}
+	// OOMKillDisable := false
+	// if memory < 1500 {
+	// 	OOMKillDisable = true
+	// }
+	// We disable OOM killer because it keeps containers in resource heavy loop
+	// This is from some discussion: If OOM-killer is disabled, tasks under cgroup will hang/sleep in memory cgroup's OOM-waitqueue when they request accountable memory
+	OOMKillDisable := true
 
 	envList := []string{}
 	for key, value := range env {