diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 1437b4f230..41ccdc19b2 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -468,9 +468,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