diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 722254e81e1e51cb8fbbae11fd3939228c2cbdfe..6fdd65d41e51e49d7171b71ec463d88bfb3eed96 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -23,6 +23,11 @@ dslproxy: "dsldev.gn4-3-wp8-soc.sunet.se"
 kspass: "Testing003"
 tspass: "Testing003"
 
+sysctlconfig:
+  - { key: "net.core.rmem_max", val: "2097152" }
+  - { key: "net.core.wmem_max", val: "2097152" }
+  - { key: "vm.max_map_count" , val:  "524288" }
+
 javamem: "384m"
 
 ca_cn: "dsldev test ca"
diff --git a/roles/build/tasks/main.yml b/roles/build/tasks/main.yml
index 2c9da2f792a97aa9c9399e4e52eb31651cdfb4f9..f94d4167a5c7b5bdcee96428d7bacd7496164182 100644
--- a/roles/build/tasks/main.yml
+++ b/roles/build/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 
+- include: system.yml
 - include: centos.yml
 - include: nginx.yml
 - include: openjdk.yml
diff --git a/roles/build/tasks/system.yml b/roles/build/tasks/system.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f36ded04ffc6e3064531021f0a4724e49e9ee80c
--- /dev/null
+++ b/roles/build/tasks/system.yml
@@ -0,0 +1,11 @@
+---
+
+- name: Set sysctl parameters
+  sysctl:
+    name: "{{item.key}}"
+    value: "{{item.val}}"
+    sysctl_file: /etc/sysctl.d/54-soctools.conf
+    sysctl_set: yes
+  with_items:
+    - "{{sysctlconfig}}"
+