diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index a1b6e204..a546364a 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -1,27 +1,42 @@
 ---
 # Ensure default values for common variables.
 - name: Define deploy user.
-  set_fact:
+  ansible.builtin.set_fact:
     deploy_user: "{{ deploy_user | default('deploy') }}"
 - name: Define deploy base path.
-  set_fact:
+  ansible.builtin.set_fact:
     deploy_base_path: "{{ deploy_base_path | default('/home/{{ deploy_user }}/deploy/{{ project_name }}_{{ build_type }}') }}"
 - name: Define mounted directory for assets.
-  set_fact:
+  ansible.builtin.set_fact:
     deploy_assets_base_path: "{{ deploy_assets_base_path | default('/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/assets') }}"
 - name: Define webroot.
-  set_fact:
+  ansible.builtin.set_fact:
     webroot: "{{ webroot | default('web') }}"
 - name: Define build deploy path prefix.
-  set_fact:
+  ansible.builtin.set_fact:
     deploy_path_prefix: "{{ deploy_base_path }}/{{ project_name }}_{{ build_type }}_build_"
 - name: Define build deploy path.
-  set_fact:
+  ansible.builtin.set_fact:
     deploy_path: "{{ deploy_path | default('{{ deploy_path_prefix }}{{ build_number }}') }}"
 - name: Define live_symlink dest.
-  set_fact:
+  ansible.builtin.set_fact:
     live_symlink_dest: "{{ live_symlink_dest | default('{{ deploy_base_path }}/live.{{ project_name }}_{{ build_type }}') }}"
 
+# 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 }}"
+- 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.
+  ansible.builtin.set_fact:
+    deploy_path: "{{ build_path | default('{{ build_path_prefix }}{{ build_number }}') }}"
+  when:
+    - deploy_code.mount_sync is defined
+    - deploy_code.mount_sync | length > 1
+    - deploy_code.mount_type == "squashfs"
+
 # Gather last known good build directly from symlink.
 # This can happen:
 # - when the first builds failed,
@@ -42,7 +57,7 @@
 
 # This is passed from caller.
 - name: Gather last known good build number.
-  set_fact:
+  ansible.builtin.set_fact:
     previous_build_number: "{{ previous_known_build_number }}"
 
 # - set_fact:
@@ -53,27 +68,37 @@
 
 # Make sure the deploy target exists.
 - name: Ensure deploy target directory exists.
-  file:
+  ansible.builtin.file:
     path: "{{ deploy_base_path }}"
     state: directory
 
+# Make sure the build target exists.
+- name: Ensure build target directory exists.
+  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"
+
 # Check for project specific init tasks.
 - name: Check that {{ project_type }}.yml exists.
-  stat:
+  ansible.builtin.stat:
     path: "{{ role_path }}/tasks/{{ project_type }}.yml"
   register: _project_type_task_result
   delegate_to: "localhost"
 
 # Project specific init tasks.
 - name: Include project init tasks.
-  include_tasks: "{{ project_type }}.yml"
+  ansible.builtin.include_tasks: "{{ project_type }}.yml"
   when:
     - _project_type_task_result.stat.exists
 
 - name: Define opcache cachetool path.
-  set_fact:
+  ansible.builtin.set_fact:
     cachetool_bin: "{{ cachetool_bin | default('/home/{{ deploy_user }}/.bin/cachetool.phar') }}"
 
 - name: Ensure we have a cachetool binary.
-  import_role:
+  ansible.builtin.import_role:
     name: cli/cachetool
diff --git a/roles/deploy_code/defaults/main.yml b/roles/deploy_code/defaults/main.yml
index be4cbceb..c0e29363 100644
--- a/roles/deploy_code/defaults/main.yml
+++ b/roles/deploy_code/defaults/main.yml
@@ -3,7 +3,7 @@ deploy_code:
   # Specify any additional symlink to create, with src (target) and dest (link).
   # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig')
   # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache')
-  # create: wether to create the target if it does not exists.
+  # create: whether to create the target if it does not exists.
   #  - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml'
   #    dest: 'vendor/simplesamlphp/simplesamlphp/config'
   #  - src: '/var/simplesaml/etc'
@@ -18,6 +18,7 @@ deploy_code:
   # Whether to sync the local deploy base to a shared destination, after successful build.
   mount_sync: ""
   # Type of file to use for sync - 'squashfs' or 'tarball'
+  # @see the _init role for SquashFS build dir paths
   mount_type: "tarball"
   # mount_sync: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/deploy"
   # Path that you want to make sure has 755 permissions. Make sure to include the webroot WITHOUT the slash.
diff --git a/roles/deploy_code/tasks/cleanup.yml b/roles/deploy_code/tasks/cleanup.yml
index e9e58146..87441926 100644
--- a/roles/deploy_code/tasks/cleanup.yml
+++ b/roles/deploy_code/tasks/cleanup.yml
@@ -26,17 +26,15 @@
   when:
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
-    - deploy_code.mount_type is defined
     - deploy_code.mount_type == "tarball"
   run_once: true
 
 - name: Create a SquashFS image of the deployed codebases.
   ansible.builtin.command:
-    cmd: "mksquashfs {{ deploy_base_path }} /tmp/{{ project_name }}_{{ build_type }}.sqsh"
+    cmd: "mksquashfs {{ build_base_path }} /tmp/{{ project_name }}_{{ build_type }}.sqsh"
   when:
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
-    - deploy_code.mount_type is defined
     - deploy_code.mount_type == "squashfs"
   run_once: true
 
@@ -56,7 +54,6 @@
   when:
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
-    - deploy_code.mount_type is defined
     - deploy_code.mount_type == "tarball"
   run_once: true
 
@@ -66,10 +63,33 @@
   when:
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
-    - deploy_code.mount_type is defined
     - deploy_code.mount_type == "squashfs"
   run_once: true
 
+- name: Copy SquashFS image to local server.
+  ansible.builtin.command:
+    cmd: "cp {{ deploy_code.mount_sync }}/{{ project_name }}_{{ build_type }}.sqsh {{ build_base_path }}/deploy.sqsh"
+  when:
+    - deploy_code.mount_sync is defined
+    - deploy_code.mount_sync | length > 1
+    - deploy_code.mount_type == "squashfs"
+
+- name: Unmount existing SquashFS image.
+  ansible.builtin.command:
+    cmd: "umount --force {{ deploy_base_path }}"
+  when:
+    - deploy_code.mount_sync is defined
+    - deploy_code.mount_sync | length > 1
+    - deploy_code.mount_type == "squashfs"
+
+- name: Mount new SquashFS image.
+  ansible.builtin.command:
+    cmd: "mount {{ build_base_path }}/deploy.sqsh {{ deploy_base_path }} -t squashfs -o loop"
+  when:
+    - deploy_code.mount_sync is defined
+    - deploy_code.mount_sync | length > 1
+    - deploy_code.mount_type == "squashfs"
+
 - name: Trigger an infrastructure rebuild.
   ansible.builtin.include_role:
     name: api_call