diff --git a/roles/bootstrap/vars/packages.yml b/roles/bootstrap/vars/packages.yml
index 34e1e86..333ffdc 100644
--- a/roles/bootstrap/vars/packages.yml
+++ b/roles/bootstrap/vars/packages.yml
@@ -28,6 +28,7 @@ archlinux:
   - cronie
   - dhcpcd
   - efibootmgr
+  - fastfetch
   - firewalld
   - fish
   - fzf
@@ -40,7 +41,6 @@ archlinux:
   - lsof
   - lvm2
   - ncdu
-  - neofetch
   - networkmanager
   - nfs-utils
   - open-vm-tools
@@ -51,9 +51,9 @@ archlinux:
   - qemu-guest-agent
   - reflector
   - rsync
-  - screen
   - sudo
   - tldr
+    tmux
   - vim
   - wireguard-tools
   - zram-generator
diff --git a/roles/cleanup/tasks/main.yml b/roles/cleanup/tasks/main.yml
index f15650c..80a1b7a 100644
--- a/roles/cleanup/tasks/main.yml
+++ b/roles/cleanup/tasks/main.yml
@@ -3,6 +3,11 @@
   vars:
     ansible_connection: ssh
   block:
+    - name: Disable Swap
+      ansible.builtin.command: swapoff -a
+      register: swapoff_result
+      changed_when: swapoff_result.rc == 0
+
     - name: Unmount /mnt if mounted
       ansible.builtin.command: umount -R /mnt
       register: unmount_result