diff --git a/modules/ocf_desktop/manifests/init.pp b/modules/ocf_desktop/manifests/init.pp
index 85280379a..1af8ea452 100644
--- a/modules/ocf_desktop/manifests/init.pp
+++ b/modules/ocf_desktop/manifests/init.pp
@@ -14,6 +14,7 @@
   include ocf_desktop::firewall_output
   include ocf_desktop::grub
   include ocf_desktop::modprobe
+  include ocf_desktop::oom_manage
   include ocf_desktop::packages
   include ocf_desktop::printnotify
   include ocf_desktop::sshfs
diff --git a/modules/ocf_desktop/manifests/oom_manage.pp b/modules/ocf_desktop/manifests/oom_manage.pp
new file mode 100644
index 000000000..96c919f80
--- /dev/null
+++ b/modules/ocf_desktop/manifests/oom_manage.pp
@@ -0,0 +1,6 @@
+class ocf_desktop::oom_manage {
+  sysctl {
+    'vm.panic_on_oom': value => '1';
+    'kernel.panic': value => '5';
+  }
+}