diff --git a/releasenotes/notes/add-rootstackname-on-update-258dbf091fea497e.yaml b/releasenotes/notes/add-rootstackname-on-update-258dbf091fea497e.yaml
new file mode 100644
index 000000000..5aa528116
--- /dev/null
+++ b/releasenotes/notes/add-rootstackname-on-update-258dbf091fea497e.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - The RootStackName parameter is now added to the plan in
+    plan-environment.yaml on both stack create and update. Previously it was
+    only added on create.
diff --git a/workbooks/plan_management.yaml b/workbooks/plan_management.yaml
index 22e132c31..c100a7005 100644
--- a/workbooks/plan_management.yaml
+++ b/workbooks/plan_management.yaml
@@ -280,9 +280,22 @@ workflows:
 
       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 %>
+          validate: <% $.validate_stack %>
+          parameters:
+            RootStackName: <% $.container %>
+        on-success: container_images_prepare
+        publish-on-error:
+          status: FAILED
+          message: <% task().result %>
+        on-error: send_message
+
       container_images_prepare:
         description: >
           Populate all container image parameters with default values.