diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index 44aa2092..53be27d3 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -26,17 +26,19 @@
 - name: Define image builds base path.
   ansible.builtin.set_fact:
     build_base_path: "/home/{{ deploy_user }}/builds/{{ project_name }}_{{ build_type }}"
+  when: deploy_code.mount_type == "squashfs"
 - name: Define image builds build path prefix.
   ansible.builtin.set_fact:
     build_path_prefix: "{{ build_base_path }}/{{ project_name }}_{{ build_type }}_build_"
+  when: deploy_code.mount_type == "squashfs"
+- name: Define live_symlink dest for image builds.
+  ansible.builtin.set_fact:
+    live_symlink_build_dest: "{{ live_symlink_build_dest | default('{{ build_base_path }}/live.{{ project_name }}_{{ build_type }}') }}"
+  when: deploy_code.mount_type == "squashfs"
 - name: Overwrite deploy and live_symlink paths if SquashFS deploy.
   ansible.builtin.set_fact:
     deploy_path: "{{ build_path | default('{{ build_path_prefix }}{{ build_number }}') }}"
-    live_symlink_dest: "{{ live_symlink_build_dest | default('{{ build_base_path }}/live.{{ project_name }}_{{ build_type }}') }}"
-  when:
-    - deploy_code.mount_sync is defined
-    - deploy_code.mount_sync | length > 1
-    - deploy_code.mount_type == "squashfs"
+  when: deploy_code.mount_type == "squashfs"
 
 # Gather last known good build directly from symlink.
 # This can happen:
@@ -78,10 +80,7 @@
   ansible.builtin.file:
     path: "{{ build_base_path }}"
     state: directory
-  when:
-    - deploy_code.mount_sync is defined
-    - deploy_code.mount_sync | length > 1
-    - deploy_code.mount_type == "squashfs"
+  when: deploy_code.mount_type == "squashfs"
 
 # Check for project specific init tasks.
 - name: Check that {{ project_type }}.yml exists.
diff --git a/roles/deploy_code/defaults/main.yml b/roles/deploy_code/defaults/main.yml
index 2c496e6b..f1f7cdb4 100644
--- a/roles/deploy_code/defaults/main.yml
+++ b/roles/deploy_code/defaults/main.yml
@@ -20,6 +20,7 @@ deploy_code:
   # mount_sync: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/deploy"
   # Type of file to use for sync - 'squashfs' or 'tarball'
   # @see the _init role for SquashFS build dir paths
+  # @see the squashfs role in ce-provision which installs the special conditions required by the deploy user to use this behaviour
   mount_type: "tarball"
   # Path that you want to make sure has 755 permissions. Make sure to include the webroot WITHOUT the slash.
   perms_fix_path: ""
diff --git a/roles/live_symlink/tasks/main.yml b/roles/live_symlink/tasks/main.yml
index 0bb1bd70..fa1d9e97 100644
--- a/roles/live_symlink/tasks/main.yml
+++ b/roles/live_symlink/tasks/main.yml
@@ -6,10 +6,17 @@
     _live_symlink_build_target: "{{ deploy_base_path }}/{{ project_name }}_{{ build_type }}_build_{{ previous_build_number }}"
   when: deploy_operation == 'revert'
 
+- ansible.builtin.set_fact:
+    _live_symlink_dest_target: "{{ live_symlink_dest }}"
+
+- ansible.builtin.set_fact:
+    _live_symlink_dest_target: "{{ live_symlink_build_dest }}"
+  when: deploy_code.mount_type == "squashfs"
+
 - name: Symlink build.
   ansible.builtin.file:
     src: "{{ _live_symlink_build_target }}"
-    dest: "{{ live_symlink_dest }}"
+    dest: "{{ _live_symlink_dest_target }}"
     state: link
     follow: false
     force: true