diff --git a/roles/deploy_code/defaults/main.yml b/roles/deploy_code/defaults/main.yml
index 62e50b00..98b1e9a2 100644
--- a/roles/deploy_code/defaults/main.yml
+++ b/roles/deploy_code/defaults/main.yml
@@ -25,6 +25,10 @@ deploy_code:
   templates: []
   # Number of builds to keep. Note this is independant of databases/dump.
   keep: 10
+  # Number of task retries - specifically for SquashFS unmount
+  unmount_retries: 3
+  # Delay in seconds - specificalčly for SquashFS unmount
+  unmount_delay: 20
   # Whether to sync the local deploy base to a shared destination, after successful build.
   mount_sync: ""
   # mount_sync: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/deploy"
diff --git a/roles/deploy_code/tasks/cleanup.yml b/roles/deploy_code/tasks/cleanup.yml
index 8d0d25b7..4a05a955 100644
--- a/roles/deploy_code/tasks/cleanup.yml
+++ b/roles/deploy_code/tasks/cleanup.yml
@@ -178,6 +178,10 @@
       become: true
       when:
         - _deploy_code_mount_check.rc == 0
+      register: task_result
+      retries: "{{ deploy_code.unmount_retries }}"
+      delay: "{{ deploy_code.unmount_delay }}"
+      until: task_result.rc == 0
 
     - name: Mount new SquashFS image.
       ansible.builtin.command:
diff --git a/roles/maintenance_mode/maintenance_mode-statuscake/tasks/offline.yml b/roles/maintenance_mode/maintenance_mode-statuscake/tasks/offline.yml
index 1aeb574f..bbbc8fa9 100644
--- a/roles/maintenance_mode/maintenance_mode-statuscake/tasks/offline.yml
+++ b/roles/maintenance_mode/maintenance_mode-statuscake/tasks/offline.yml
@@ -16,3 +16,4 @@
     - domain.statuscake_check_id | length > 0
     - domain.statuscake_api_key is defined
     - domain.statuscake_api_key | length > 0
+  no_log: true
diff --git a/roles/maintenance_mode/maintenance_mode-statuscake/tasks/online.yml b/roles/maintenance_mode/maintenance_mode-statuscake/tasks/online.yml
index 1bed8ec3..4d1162b8 100644
--- a/roles/maintenance_mode/maintenance_mode-statuscake/tasks/online.yml
+++ b/roles/maintenance_mode/maintenance_mode-statuscake/tasks/online.yml
@@ -16,3 +16,4 @@
     - domain.statuscake_check_id | length > 0
     - domain.statuscake_api_key is defined
     - domain.statuscake_api_key | length > 0
+  no_log: true