diff --git a/roles/raspi/tasks/main.yaml b/roles/raspi/tasks/main.yaml
index 8f4a667..8ceaa14 100644
--- a/roles/raspi/tasks/main.yaml
+++ b/roles/raspi/tasks/main.yaml
@@ -24,3 +24,16 @@
     regexp: "^#?display_rotate"
   when: raspi_rotate_display is defined
   notify: reboot
+
+- name: Disable swap
+  block:
+    - name: Stop swap service
+      systemd:
+        name: dphys-swapfile
+        state: stopped
+        enabled: no
+
+    - name: Remove swap file
+      command: dphys-swapfile uninstall
+      args:
+        removes: /var/swap