diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index a546364a..b09ac7dc 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -29,9 +29,10 @@
 - name: Define image builds build path prefix.
   ansible.builtin.set_fact:
     build_path_prefix: "{{ build_base_path }}/{{ project_name }}_{{ build_type }}_build_"
-- name: Overwrite deploy path if SquashFS deploy.
+- 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_dest | default('{{ build_base_path }}/live.{{ project_name }}_{{ build_type }}') }}"
   when:
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
diff --git a/roles/live_symlink/tasks/main.yml b/roles/live_symlink/tasks/main.yml
index 246f55c7..0bb1bd70 100644
--- a/roles/live_symlink/tasks/main.yml
+++ b/roles/live_symlink/tasks/main.yml
@@ -1,20 +1,21 @@
 ---
-- set_fact:
+- ansible.builtin.set_fact:
     _live_symlink_build_target: "{{ deploy_base_path }}/{{ project_name }}_{{ build_type }}_build_{{ build_number }}"
 
-- set_fact:
+- ansible.builtin.set_fact:
     _live_symlink_build_target: "{{ deploy_base_path }}/{{ project_name }}_{{ build_type }}_build_{{ previous_build_number }}"
   when: deploy_operation == 'revert'
 
 - name: Symlink build.
-  file:
+  ansible.builtin.file:
     src: "{{ _live_symlink_build_target }}"
     dest: "{{ live_symlink_dest }}"
     state: link
+    follow: false
     force: true
 
 - name: Generate additional templates.
-  template:
+  ansible.builtin.template:
     src: "{{ template.src }}"
     dest: "{{ deploy_path }}/{{ template.dest }}"
   with_items: "{{ live_symlink.templates }}"
@@ -25,10 +26,11 @@
     - deploy_operation == 'deploy'
 
 - name: Create additional symlinks.
-  file:
+  ansible.builtin.file:
     src: "{{ link.src }}"
     dest: "{{ deploy_path }}/{{ link.dest }}"
     state: link
+    follow: false
     force: true
   with_items: "{{ live_symlink.symlinks }}"
   loop_control: