diff --git a/MIGRATION.md b/MIGRATION.md
index c3da484..76347c8 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -18,18 +18,18 @@ On the hosts:
 
 ## Roles
 
-| Role name            | Modified? | Tested?  | Production? | Notes                                                                |
-|----------------------|:---------:|:--------:|:-----------:|----------------------------------------------------------------------|
-|`roles/service`       | **YES**   | **YES**  | NO          | New `apt` module style for packages.                                 |
-|`roles/ssh_server`    | **YES**   | **YES**  | NO          | `lxc_ssh.py` --> `ssh_lxc.py`, multi-key support.                    |
-|`roles/ca`            | **YES**   | ReadNote | NO          | New `apt` module style for pacakges. Works with this [ca_manager].   |
-|`prepare_host.yaml`   | **YES**   | **YES**  | NO          | Migrate Debian release to Buster and Python 2 to 3.                  |
-|`roles/lxc_guest`     | **YES**   | **YES**  | NO          | Updated Debian and LXC. `xfs` ***broken***, `ext4` working.          |
-|`roles/ldap`          | **YES**   | **YES**  | NO          | `phamm.schema` now provided locally.                                 |
-|`roles/nginx`         | NO        | NO       | NO          |                                                                      |
-|`roles/projects`      | NO        | NO       | NO          |                                                                      |
-|`roles/dns_record`    | NO        | NO       | NO          |                                                                      |
-|`roles/openvpn`       | NO        | NO       | NO          |                                                                      |
+| Role name           | Modified? | Tested?  | Production? | Notes                                                              |
+|---------------------|:---------:|:--------:|:-----------:|--------------------------------------------------------------------|
+| `roles/service`     | **YES**   | **YES**  | NO          | New `apt` module style for packages.                               |
+| `roles/ssh_server`  | **YES**   | **YES**  | NO          | `lxc_ssh.py` --> `ssh_lxc.py`, multi-key support.                  |
+| `roles/ca`          | **YES**   | ReadNote | NO          | New `apt` module style for pacakges. Works with this [ca_manager]. |
+| `prepare_host.yaml` | **YES**   | **YES**  | NO          | Migrate Debian release to Buster and Python 2 to 3.                |
+| `roles/lxc_guest`   | **YES**   | **YES**  | NO          | Updated Debian and LXC.                                            |
+| `roles/ldap`        | **YES**   | **YES**  | NO          | `phamm.schema` now provided locally.                               |
+| `roles/nginx`       | NO        | NO       | NO          |                                                                    |
+| `roles/projects`    | NO        | NO       | NO          |                                                                    |
+| `roles/dns_record`  | NO        | NO       | NO          |                                                                    |
+| `roles/openvpn`     | NO        | NO       | NO          |                                                                    |
 
 
 ## Plugins and Modules
diff --git a/prepare_host.yaml b/prepare_host.yaml
index c8c6e19..d20b92b 100644
--- a/prepare_host.yaml
+++ b/prepare_host.yaml
@@ -20,6 +20,13 @@
       apt:
         name: xfsprogs
         state: present
+      notify: load xfs module
+
+    - name: autoload xfs module
+      copy:
+        content: "xfs\n"
+        dest: /etc/modules-load.d/xfs.conf
+      notify: load xfs module
 
     - name: install network bridge utilities
       apt:
@@ -62,6 +69,10 @@
         state: restarted
     - name: restart lvm
       shell: /etc/init.d/lvm2 reload
+    - name: load xfs module
+      modprobe:
+        name: xfs
+        state: present
 
 - hosts: status
   roles:
diff --git a/roles/lxc_guest/tasks/main.yaml b/roles/lxc_guest/tasks/main.yaml
index 2142a7b..4d7d3fb 100644
--- a/roles/lxc_guest/tasks/main.yaml
+++ b/roles/lxc_guest/tasks/main.yaml
@@ -22,7 +22,7 @@
           fs_size: "{{ vm_size }}"
           vg_name: "{{ vg_name | default(inventory_hostname+'vg') }}"
           lv_name: "vm_{{ vm_name }}"
-          fs_type: ext4
+          fs_type: xfs
           container_log: true
           template: debian
           template_options: --release {{ distro }} --packages=ssh,python3