diff --git a/roles/authelia/defaults/main.yml b/roles/authelia/defaults/main.yml
index bfa0fe3a5f..a02de03f42 100644
--- a/roles/authelia/defaults/main.yml
+++ b/roles/authelia/defaults/main.yml
@@ -275,7 +275,7 @@ authelia_docker_security_opts: "{{ authelia_docker_security_opts_default
                                    + authelia_docker_security_opts_custom }}"
 
 # Restart Policy
-authelia_docker_restart_policy: always
+authelia_docker_restart_policy: unless-stopped
 
 # State
 authelia_docker_state: started
diff --git a/roles/ddns/defaults/main.yml b/roles/ddns/defaults/main.yml
index deb32a58b7..34357de1d0 100644
--- a/roles/ddns/defaults/main.yml
+++ b/roles/ddns/defaults/main.yml
@@ -111,7 +111,7 @@ ddns_docker_security_opts: "{{ ddns_docker_security_opts_default
                                + ddns_docker_security_opts_custom }}"
 
 # Restart Policy
-ddns_docker_restart_policy: always
+ddns_docker_restart_policy: unless-stopped
 
 # State
 ddns_docker_state: started
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a5f20655f9..9448afe7a4 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -114,6 +114,13 @@
   ansible.builtin.import_tasks: "subtasks/controller.yml"
   when: not docker_service_check
 
+- name: Unblock Docker Controller
+  ansible.builtin.uri:
+    url: "{{ docker_controller_url }}/unblock"
+    method: POST
+    timeout: 600
+  ignore_errors: true
+
 - name: Stop Saltbox Containers
   ansible.builtin.uri:
     url: "{{ docker_controller_url }}/stop"
@@ -180,10 +187,3 @@
   ansible.builtin.include_role:
     name: ctop
   tags: ctop
-
-- name: Unblock Docker Controller
-  ansible.builtin.uri:
-    url: "{{ docker_controller_url }}/unblock"
-    method: POST
-    timeout: 600
-  ignore_errors: true
diff --git a/roles/docker/tasks/subtasks/controller.yml b/roles/docker/tasks/subtasks/controller.yml
index dd27e71ff2..1bbdc2e90d 100644
--- a/roles/docker/tasks/subtasks/controller.yml
+++ b/roles/docker/tasks/subtasks/controller.yml
@@ -61,6 +61,13 @@
   ansible.builtin.wait_for:
     timeout: "10"
 
+- name: Block Docker Controller
+  ansible.builtin.uri:
+    url: "{{ docker_controller_url }}/block/20"
+    method: POST
+    timeout: 600
+  ignore_errors: true
+
 - name: Controller | Import 'saltbox_managed_docker_controller.service'
   ansible.builtin.template:
     src: docker-controller-helper.service.j2
@@ -74,3 +81,10 @@
     enabled: true
     state: started
     daemon_reload: true
+
+- name: Unblock Docker Controller
+  ansible.builtin.uri:
+    url: "{{ docker_controller_url }}/unblock"
+    method: POST
+    timeout: 600
+  ignore_errors: true
diff --git a/roles/jaeger/defaults/main.yml b/roles/jaeger/defaults/main.yml
index 07c29a1e53..c09a8ec93e 100644
--- a/roles/jaeger/defaults/main.yml
+++ b/roles/jaeger/defaults/main.yml
@@ -135,7 +135,7 @@ jaeger_docker_security_opts: "{{ jaeger_docker_security_opts_default
                                  + jaeger_docker_security_opts_custom }}"
 
 # Restart Policy
-jaeger_docker_restart_policy: always
+jaeger_docker_restart_policy: unless-stopped
 
 # State
 jaeger_docker_state: started
diff --git a/roles/lldap/defaults/main.yml b/roles/lldap/defaults/main.yml
index 8c5ef57b30..81bda770a3 100644
--- a/roles/lldap/defaults/main.yml
+++ b/roles/lldap/defaults/main.yml
@@ -161,7 +161,7 @@ lldap_docker_security_opts: "{{ lldap_docker_security_opts_default
                                 + lldap_docker_security_opts_custom }}"
 
 # Restart Policy
-lldap_docker_restart_policy: always
+lldap_docker_restart_policy: unless-stopped
 
 # State
 lldap_docker_state: started
diff --git a/roles/redis/defaults/main.yml b/roles/redis/defaults/main.yml
index 33bcae2046..ec3bc653e1 100644
--- a/roles/redis/defaults/main.yml
+++ b/roles/redis/defaults/main.yml
@@ -108,7 +108,7 @@ redis_docker_security_opts: "{{ lookup('vars', redis_name + '_docker_security_op
                                 + lookup('vars', redis_name + '_docker_security_opts_custom', default=redis_docker_security_opts_custom) }}"
 
 # Restart Policy
-redis_docker_restart_policy: always
+redis_docker_restart_policy: unless-stopped
 
 # State
 redis_docker_state: started
diff --git a/roles/traefik/defaults/main.yml b/roles/traefik/defaults/main.yml
index 403974f65c..08cd56dea4 100644
--- a/roles/traefik/defaults/main.yml
+++ b/roles/traefik/defaults/main.yml
@@ -466,7 +466,7 @@ traefik_docker_security_opts: "{{ traefik_docker_security_opts_default
                                   + traefik_docker_security_opts_custom }}"
 
 # Restart Policy
-traefik_docker_restart_policy: always
+traefik_docker_restart_policy: unless-stopped
 
 # State
 traefik_docker_state: started