diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd
index bb1a3c8..a5e5f79 100644
--- a/ansible/environments/laptop/host_vars/odofreebsd
+++ b/ansible/environments/laptop/host_vars/odofreebsd
@@ -37,12 +37,6 @@ users:
 devfs_rules: "odo_devfs.rules"
 jail_zfs_dataset: zroot/freebsd/release/jails
 jail_zfs_dataset_mountpoint: /jail/main
-jail_list:
-  - name: cloak
-    conf:
-      src: cloak
-  - name: dagger
-    conf:
-      src: dagger
 bhyve_dataset: zroot/freebsd/release/vm
 bhyve_list: []
+efi_dev: /dev/gpt/EFI
diff --git a/ansible/roles/base/files/disk_labels_loader.conf b/ansible/roles/base/files/disk_labels_loader.conf
new file mode 100644
index 0000000..a8a4603
--- /dev/null
+++ b/ansible/roles/base/files/disk_labels_loader.conf
@@ -0,0 +1,8 @@
+# Disabling both of these will make /dev/gpt/* populated
+#
+# This uses gpt partition labels which you can set with:
+#
+#     gpart modify -l EFI -i 1 nvd0
+
+# kern.geom.label.disk_ident.enable="0"
+# kern.geom.label.gptid.enable="1"
diff --git a/ansible/roles/base/tasks/freebsd.yaml b/ansible/roles/base/tasks/freebsd.yaml
index 363b2f8..a073d84 100644
--- a/ansible/roles/base/tasks/freebsd.yaml
+++ b/ansible/roles/base/tasks/freebsd.yaml
@@ -95,6 +95,20 @@
       fstype: tmpfs
       opts: rw,mode=777
 
+- name: Add fstab entries
+  when: efi_dev is defined
+  mount:
+    name: "{{ item.dst }}"
+    src: "{{ item.src }}"
+    fstype: "{{ item.fstype }}"
+    opts: "{{ item.opts }}"
+    state: present
+  loop:
+    - dst: /boot/efi
+      src: "{{ efi_dev }}"
+      fstype: msdosfs
+      opts: rw
+
 - name: Install scripts
   copy:
     src: "files/{{ item.src }}"
@@ -122,3 +136,13 @@
     name: bemount_enable
     value: "YES"
     path: /etc/rc.conf.d/bemount
+
+- name: Install loader.conf
+  copy:
+    src: "files/{{ item }}_loader.conf"
+    dest: "/boot/loader.conf.d/{{ item }}.conf"
+    mode: 0644
+    owner: root
+    group: wheel
+  loop:
+    - disk_labels