diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 7a95333..5a12558 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -141,5 +141,14 @@
     replace: '\1{{ inventory_hostname }}\2'
     backup: yes
 
-- name: swap
-  include: swap.yml
+- name: Turn off swap
+  shell: swapoff -a
+
+- name: swap - remove current swaps from fstab
+  lineinfile:
+    dest: /etc/fstab
+    regexp: '^\/[\S]+\s+none\s+swap '
+    state: absent
+
+#- name: swap
+#  include: swap.yml