diff --git a/roles/cloudlab-prep/defaults/main.yml b/roles/cloudlab-prep/defaults/main.yml
index 99c6595..0d37b1c 100644
--- a/roles/cloudlab-prep/defaults/main.yml
+++ b/roles/cloudlab-prep/defaults/main.yml
@@ -2,5 +2,11 @@
 # roles/cloudlab-prep/defaults/main.yml
 
 cloudlab_extrafs:
-  - { mount: /var/lib/uvtool/libvirt/images, dev: /dev/sda }
-  - { mount: /var/lib/nova, dev: /dev/sdb }
+  - { mount: /mnt/extra, dev: /dev/sdb }
+
+cloudlab_links:
+  - { src: /mnt/extra/lxc, dest: /var/lib/lxc  }
+  - { src: /mnt/extra/lxd, dest: /var/lib/lxd  }
+  - { src: /mnt/extra/uvtool, dest: /var/lib/uvtool }
+  - { src: /mnt/extra/nova, dest: /var/lib/nova }
+  - { src: /mnt/extra/juju, dest: /var/lib/juju }
diff --git a/roles/cloudlab-prep/tasks/main.yml b/roles/cloudlab-prep/tasks/main.yml
index f66e94d..bfe9cd8 100644
--- a/roles/cloudlab-prep/tasks/main.yml
+++ b/roles/cloudlab-prep/tasks/main.yml
@@ -18,3 +18,15 @@
   retries: 3
   delay: 5
 
+- name: Set up symlink targets
+  file:
+    path: "{{ item.src }}"
+    state: directory
+  with_items: "{{ cloudlab_links }}"
+
+- name: Create symlinks
+  file:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    state: link
+  with_items: "{{ cloudlab_links }}"