diff --git a/group_vars/all b/group_vars/all
index 131dec4b..abb115bc 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -58,7 +58,7 @@ system_maintenance_timeout_cleanup_services:  "15min"
 system_maintenance_timeout_backup_services:   "1h"
 system_maintenance_timeout_heal_docker:       "30min"
 system_maintenance_timeout_update_docker:     "5min"
-
+system_maintenance_timeout_defrost_docker:    "10min"
 
 ## Services
 
diff --git a/roles/heal-docker/templates/heal-docker.service.j2 b/roles/heal-docker/templates/heal-docker.service.j2
index 843abd76..830334bd 100644
--- a/roles/heal-docker/templates/heal-docker.service.j2
+++ b/roles/heal-docker/templates/heal-docker.service.j2
@@ -4,5 +4,5 @@ OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot
-ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} freeze "{{ system_maintenance_services }}" --ignore "{{system_maintenance_cleanup_services}}" --timeout "{{system_maintenance_heal_docker}}"'
+ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} freeze "{{ system_maintenance_services }}" --ignore "{{system_maintenance_cleanup_services}}" --timeout "{{system_maintenance_timeout_heal_docker}}"'
 ExecStart=/bin/sh -c '/bin/python {{heal_docker}}heal-docker.py && systemctl start system-maintenance-service-defrost.service'
\ No newline at end of file
diff --git a/roles/system-maintenance-service-freezer/templates/system-maintenance-service-freezer.service.j2 b/roles/system-maintenance-service-freezer/templates/system-maintenance-service-freezer.service.j2
index d88e745a..d729a822 100644
--- a/roles/system-maintenance-service-freezer/templates/system-maintenance-service-freezer.service.j2
+++ b/roles/system-maintenance-service-freezer/templates/system-maintenance-service-freezer.service.j2
@@ -4,5 +4,5 @@ OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot
-ExecPreStart=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} {{item}} "{{ system_maintenance_services + [item] }}"'
+ExecPreStart=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} {{item}} "{{ system_maintenance_services + [item] }}" --timeout "{{system_maintenance_timeout_defrost_docker}}"'
 ExecStart=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} {{item}} "{{ system_maintenance_services }}"'
\ No newline at end of file
diff --git a/roles/update-docker/templates/update-docker.service.j2 b/roles/update-docker/templates/update-docker.service.j2
index f65e10a7..de802adc 100644
--- a/roles/update-docker/templates/update-docker.service.j2
+++ b/roles/update-docker/templates/update-docker.service.j2
@@ -5,5 +5,5 @@ OnFailure=systemd-notifier@%n.service
 [Service]
 Type=oneshot
 {% if force_backup_before_update | bool %}ExecStartPre=/bin/sh -c 'systemctl start backup-docker-to-local.service'{% endif %}
-ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} freeze "{{ system_maintenance_services }}" --ignore "{{system_maintenance_cleanup_services +  ['update-docker'] }}" --timeout "{{system_maintenance_heal_docker}}"'
+ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} freeze "{{ system_maintenance_services }}" --ignore "{{system_maintenance_cleanup_services +  ['update-docker'] }}" --timeout "{{system_maintenance_timeout_heal_docker}}"'
 ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{path_docker_compose_instances}} && systemctl start system-maintenance-service-defrost.service'
\ No newline at end of file