diff --git a/workbooks/plan_management.yaml b/workbooks/plan_management.yaml
index e240324a1..77bbd9a18 100644
--- a/workbooks/plan_management.yaml
+++ b/workbooks/plan_management.yaml
@@ -118,13 +118,25 @@ workflows:
       create_plan:
         on-success:
           - ensure_passwords_exist: <% $.generate_passwords = true %>
-          - container_images_prepare: <% $.generate_passwords != true %>
+          - add_root_stack_name: <% $.generate_passwords != true %>
 
       ensure_passwords_exist:
         action: tripleo.parameters.generate_passwords container=<% $.container %>
-        on-success: container_images_prepare
+        on-success: add_root_stack_name
         on-error: ensure_passwords_exist_set_status_failed
 
+      add_root_stack_name:
+        action: tripleo.parameters.update
+        input:
+          container: <% $.container %>
+          parameters:
+            RootStackName: <% $.container %>
+        on-success: container_images_prepare
+        publish-on-error:
+          status: FAILED
+          message: <% task().result %>
+        on-error: notify_zaqar
+
       container_images_prepare:
         description: >
           Populate all container image parameters with default values.