diff --git a/common/deploy-steps-playbooks-common.yaml b/common/deploy-steps-playbooks-common.yaml
index 975aea55f2..5ec1350a7c 100644
--- a/common/deploy-steps-playbooks-common.yaml
+++ b/common/deploy-steps-playbooks-common.yaml
@@ -33,6 +33,7 @@
     - always
 
 - hosts: "{{ deploy_target_host }}"
+  strategy: tripleo_linear
   name: Ensure /var/lib/config-data context
   become: true
   gather_facts: false
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 39b9ea0404..a63798f4cf 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -452,6 +452,7 @@ outputs:
                 deploy_target_host: "DEPLOY_TARGET_HOST"
 
             - hosts: DEPLOY_TARGET_HOST
+              strategy: tripleo_linear
               name: Manage SELinux
               gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
               any_errors_fatal: yes
@@ -463,6 +464,7 @@ outputs:
                     state: SELINUX_MODE
 
             - hosts: all
+              strategy: tripleo_linear
               name: Generate /etc/hosts
               gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
               any_errors_fatal: yes
@@ -478,6 +480,7 @@ outputs:
 {% endraw %}
 
             - hosts: DEPLOY_TARGET_HOST
+              strategy: tripleo_linear
               name: Common roles for TripleO servers
               gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
               any_errors_fatal: yes
@@ -830,6 +833,7 @@ outputs:
 {% endraw %}
 
             - hosts: DEPLOY_SOURCE_HOST
+              strategy: tripleo_linear
               name: External deployment Post Deploy tasks
               gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
               any_errors_fatal: yes