diff --git a/roles/base/vars/main.yml b/roles/base/vars/main.yml
index dcb9406..2b9c5a7 100644
--- a/roles/base/vars/main.yml
+++ b/roles/base/vars/main.yml
@@ -1,3 +1,2 @@
 rene_password:
-swappiness_value: 5
 root_home: "{{ lookup('env','HOME') }}"
\ No newline at end of file
diff --git a/roles/server/tasks/system_setup/swap.yml b/roles/server/tasks/system_setup/swap.yml
new file mode 100644
index 0000000..4042f70
--- /dev/null
+++ b/roles/server/tasks/system_setup/swap.yml
@@ -0,0 +1,15 @@
+- block:
+  - name: server | system setup | create swapfile
+    command: "fallocate -l {{ ansible_facts['memtotal_mb'] / 4 | round }} /swapfile"
+  - name: server | system setup | format swapfile
+    filesystem:
+      fstype: swap
+      dev: "/swapfile" # required. Target path to device or image file.
+  - name: server | system setup | enable swap
+    command: "swapon /swapfile"
+  - name: server | system setup | edit fstab
+    lineinfile:
+      path: "/etc/fstab"
+      state: present
+      line: "/swapfile none swap sw 0 0"
+  when: ansible_facts['memory_mb']['swap']['total'] == '0'
\ No newline at end of file
diff --git a/roles/server/tasks/system_setup/sysctl.yml b/roles/server/tasks/system_setup/sysctl.yml
new file mode 100644
index 0000000..c13a439
--- /dev/null
+++ b/roles/server/tasks/system_setup/sysctl.yml
@@ -0,0 +1,9 @@
+- name: server | system setup | sysctl
+  sysctl:
+    name: "{{ item.key }}"
+    value: "{{ item.value }}"
+    state: present
+    reload: yes
+  loop:
+    - { key: "vm.swappiness", value: "10"}
+    - { key: "vm.vfs_cache_pressure", value: "50"}
\ No newline at end of file
diff --git a/roles/server/vars/main.yml b/roles/server/vars/main.yml
index e69de29..f4ed801 100644
--- a/roles/server/vars/main.yml
+++ b/roles/server/vars/main.yml
@@ -0,0 +1 @@
+swappiness_value: 5