diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index b66a2bb658..8cad7081cd 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -481,9 +481,11 @@ outputs:
                   run_once: true
                   debug:
                     msg: Use --start-at-task 'Common roles for TripleO servers' to resume from this task
-              roles:
-                - tripleo_bootstrap
-                - tripleo_ssh_known_hosts
+              tasks:
+                - include_role:
+                    name: tripleo_bootstrap
+                - include_role:
+                    name: tripleo_ssh_known_hosts
               tags:
                 - common_roles