diff --git a/Makefile b/Makefile
index 729282b..6504036 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ test:
 	# env DOCKER_SOCKET="unix:///var/run/docker.sock" go test -v containers/*.go # Doesn't work in Drone right now
 
 build:
-	#podman run --rm --privileged -ti -v ${shell pwd}:/srv docker.io/library/golang:1.14-stretch /bin/sh -c "cd /srv && go build"
-	go build -a -ldflags "-linkmode external -extldflags '-static' -s -w"
+	podman run --rm --privileged -ti -v ${shell pwd}:/srv docker.io/library/golang:1.24-bookworm /bin/sh -c "cd /srv && go build -o node-api-bookworm"
+	#go build -a -ldflags "-linkmode external -extldflags '-static' -s -w"
 
 .PHONY: minio
 minio:
diff --git a/containers/docker.go b/containers/docker.go
index 5842514..39d9b59 100644
--- a/containers/docker.go
+++ b/containers/docker.go
@@ -343,8 +343,9 @@ func (d *Driver) Create(name string, image string, volumePath string, HTTPPort i
 	// 	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
+	// 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.
+	// Disabling OOM killer kills the whole machine because some kernel processes get under memory pressure and the host system becomes unresponsive.
+	OOMKillDisable := false
 
 	envList := []string{}
 	for key, value := range env {