diff --git a/config/docker_config.go b/config/docker_config.go
index e3b6eefd..5c48fb34 100644
--- a/config/docker_config.go
+++ b/config/docker_config.go
@@ -11,6 +11,12 @@ func (d *DockerConfig) FullArgs() []string {
 	args := []string{}
 	args = append(args, generateEngineOptsSlice(d.EngineOpts)...)
 	args = append(args, d.ExtraArgs...)
+
+	// Make sure that OOM killer will kill containers before user docker
+	// https://github.com/burmilla/os/issues/33
+	args = append(args, "--oom-score-adjust")
+	args = append(args, "-250")
+
 	if d.TLS {
 		args = append(args, d.TLSArgs...)
 	}
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 19f6e276..d2f47c46 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -251,6 +251,7 @@ rancher:
       pid: host
       ipc: host
       privileged: true
+      oom_score_adj: -100
       restart: always
       volumes_from:
       - all-volumes