diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index c054e8fb..73bac9f6 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -31,38 +31,33 @@
     - cache_clear_opcache.cachetool_bin is defined
     - cache_clear_opcache.cachetool_bin | length > 0
 
-# Manipulate variables for SquashFS builds.
-- 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 is defined
-    - 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 is defined
-    - 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 is defined
-    - 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 }}') }}"
-  when:
-    - deploy_code.mount_type is defined
-    - deploy_code.mount_type == "squashfs"
-- name: Overwrite cachetool path if SquashFS deploy and path not provided.
-  ansible.builtin.set_fact:
-    cachetool_bin: "{{ build_base_path }}/cachetool.phar"
+- name: Manipulate variables for SquashFS builds.
+  block:
+    - name: Define image builds base path.
+      ansible.builtin.set_fact:
+        build_base_path: "/home/{{ deploy_user }}/builds/{{ project_name }}_{{ build_type }}"
+
+    - name: Define image builds build path prefix.
+      ansible.builtin.set_fact:
+        build_path_prefix: "{{ build_base_path }}/{{ project_name }}_{{ build_type }}_build_"
+
+    - 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 }}') }}"
+
+    - name: Overwrite deploy and live_symlink paths if SquashFS deploy.
+      ansible.builtin.set_fact:
+        deploy_path: "{{ build_path | default('{{ build_path_prefix }}{{ build_number }}') }}"
+
+    - name: Overwrite cachetool path if SquashFS deploy and path not provided.
+      ansible.builtin.set_fact:
+        cachetool_bin: "{{ build_base_path }}/cachetool.phar"
+      when:
+        - cache_clear_opcache.cachetool_bin is not defined
   when:
     - deploy_code.mount_type is defined
     - deploy_code.mount_type == "squashfs"
-    - cache_clear_opcache.cachetool_bin is not defined
+    - deploy_operation == 'deploy'
 
 # Gather last known good build directly from symlink.
 # This can happen: