diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67315979..d9cd0803 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Changed
 
+* docker: Allow "live-restore" to be toggled with docker_conf_live_restore
+
 ### Fixed
 
 ### Removed
diff --git a/docker-host/defaults/main.yml b/docker-host/defaults/main.yml
index 5b64f342..3f713930 100644
--- a/docker-host/defaults/main.yml
+++ b/docker-host/defaults/main.yml
@@ -9,6 +9,9 @@ docker_conf_use_iptables: False
 # Disable the possibility for containers processes to gain new privileges
 docker_conf_no_newprivileges: False
 
+# Toggle live restore (need to be disabled in swarm mode)
+docker_conf_live_restore: True
+
 # Disable all default network connectivity
 docker_conf_disable_default_networking: False
 
diff --git a/docker-host/templates/daemon.json.j2 b/docker-host/templates/daemon.json.j2
index c73268d9..08dcb1b2 100644
--- a/docker-host/templates/daemon.json.j2
+++ b/docker-host/templates/daemon.json.j2
@@ -5,7 +5,7 @@
   "data-root": "{{ docker_home }}",
 
   {# Keep containers running while docker daemon downtime #}
-  "live-restore": true,
+  "live-restore": {{ docker_conf_live_restore | to_json }},,
 
   {# Turn on user namespace remaping #}
   "userns-remap": "default",