diff --git a/ansible/group_vars/all/vars.yml b/ansible/group_vars/all/vars.yml
index c6a97577..dbfb3731 100644
--- a/ansible/group_vars/all/vars.yml
+++ b/ansible/group_vars/all/vars.yml
@@ -182,14 +182,13 @@ snapraid_runner_smtp_host: "{{ email_smtp_host }}"
 
 snapraid_runner_smtp_port: "{{ email_smtp_port }}"
 
+snapraid_runner_delete_threshold: 5000
+
 snapraid_runner_email_sendon: "error"
 
 snapraid_runner_use_ssl: true
 
-content_file: "{{ disks[0].name }}/snapraid.content"
-
 snapraid_content_files:
-  - "{{ content_file }}"
   - /var/snapraid.content
 
 snapraid_config_excludes:
@@ -197,7 +196,7 @@ snapraid_config_excludes:
   - /lost+found/
   - "*.!sync"
   - /tmp/
-  - "Downloads"
+  - "/Downloads/*"
 
 
 #
diff --git a/ansible/roles/avahi/templates/samba.service b/ansible/roles/avahi/templates/samba.service
index 65bee947..34dac365 100644
--- a/ansible/roles/avahi/templates/samba.service
+++ b/ansible/roles/avahi/templates/samba.service
@@ -11,6 +11,6 @@
                 <service>
                         <type>_device-info._tcp</type>
                         <port>0</port>
-                        <txt-record>model=Xserve</txt-record>
+                        <txt-record>model=TimeCapsule</txt-record>
                 </service>
 </service-group>
\ No newline at end of file
diff --git a/ansible/roles/essential/tasks/main.yml b/ansible/roles/essential/tasks/main.yml
index a3900e7e..2789c4af 100644
--- a/ansible/roles/essential/tasks/main.yml
+++ b/ansible/roles/essential/tasks/main.yml
@@ -58,6 +58,7 @@
     repo: "{{ dotfiles_repo }}"
     dest: /home/{{ username }}/dotfiles
     recursive: no
+    force: yes
 
 - name: Stow the dotfiles
   shell: cd /home/{{ username }}/dotfiles && stow -v */
@@ -76,6 +77,7 @@
     regexp: 'fish_greeting:.+'
     line: 'SETUVAR fish_greeting:'
   when: '"fish" in shell'
+  ignore_errors: true
 
 - name: Set the correct ownership for the user's home folder (not using ansible.builtin.file because of idempotency)
   shell:
diff --git a/cloud-init/cloud-init.yml b/cloud-init/cloud-init.yml
deleted file mode 100644
index 8075a657..00000000
--- a/cloud-init/cloud-init.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-#cloud-config
-autoinstall:
-  version: 1
-  identity: {hostname: fragile, username: notthebee, password: notthebee,}
-  keyboard: {layout: us, variant: ''}
-  locale: en_US.UTF-8
-  network:
-    network:
-      version: 2
-      ethernets:
-        enp1s0:
-          critical: true
-          dhcp-identifier: mac
-          dhcp4: true
-  ssh:
-    allow-pw: true
-    authorized-keys: []
-    install-server: true
-  storage:
-    grub:
-      reorder_uefi: False
-    swap:
-      size: 0
-    config:
-    - {ptable: gpt, path: /dev/sda, preserve: false, name: '', grub_device: false,
-      type: disk, id: disk-sda}
-    - {device: disk-sda, size: 536870912, wipe: superblock, flag: boot, number: 1,
-      preserve: false, grub_device: true, type: partition, id: partition-sda1}
-    - {fstype: fat32, volume: partition-sda1, preserve: false, type: format, id: format-2}
-    - {device: disk-sda, size: 1073741824, wipe: superblock, flag: linux, number: 2,
-      preserve: false, grub_device: false, type: partition, id: partition-sda2}
-    - {fstype: ext4, volume: partition-sda2, preserve: false, type: format, id: format-0}
-    - {device: disk-sda, size: -1, flag: linux, number: 3, preserve: false,
-      grub_device: false, type: partition, id: partition-sda3}
-    - {fstype: ext4, volume: lvm-partition-lv-root, preserve: false, type: format,
-      id: format-1}
-    - {device: format-1, path: /, type: mount, id: mount-2}
-    - {device: format-0, path: /boot, type: mount, id: mount-1}
-    - {device: format-2, path: /boot/efi, type: mount, id: mount-3}
-  user-data:
-    users:
-      - notthebee
-      - name: notthebee
-        ssh_import_id: gh:notthebee
diff --git a/cloud-init/user-data b/cloud-init/user-data
new file mode 100644
index 00000000..724962bf
--- /dev/null
+++ b/cloud-init/user-data
@@ -0,0 +1,37 @@
+#cloud-config
+autoinstall:
+  version: 1
+  locale: en_us.UTF-8
+  keyboard:
+    layout: us
+  identity:
+    hostname: fragile
+    password: "$1$xyz$7ujQcnF8S3A6JQDF2fcsc/"
+    username: notthebee
+  network:
+    network:
+      version: 2
+      ethernets:
+        enp1s0:
+          critical: true
+          dhcp-identifier: mac
+          dhcp4: true
+  ssh:
+    install-server: true
+    authorized-keys: [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKGUGMUo1dRl9xoDlMxQGb8dNSY+6xiEpbZWAu6FAbWw moe@notthebe.ee" ]
+  storage:
+    grub:
+      reorder_uefi: False
+    swap:
+      size: 0
+    config:
+    - {ptable: gpt, serial: HFS128G39TNF-N3A0A_MJ89N5458114A9M3C, preserve: false, name: '', grub_device: false, type: disk, id: bootdrive}
+
+    - {device: bootdrive, size: 536870912, wipe: superblock, flag: boot, number: 1, preserve: false, grub_device: true, type: partition, id: efipart}
+    - {fstype: fat32, volume: efipart, preserve: false, type: format, id: efi}
+
+    - {device: bootdrive, size: -1, wipe: superblock, flag: linux, number: 2, preserve: false, grub_device: false, type: partition, id: rootpart}
+    - {fstype: ext4, volume: rootpart, preserve: false, type: format, id: root}
+
+    - {device: root, path: /, type: mount, id: rootmount}
+    - {device: efi, path: /boot/efi, type: mount, id: efimount}
\ No newline at end of file