diff --git a/workbooks/plan_management.yaml b/workbooks/plan_management.yaml
index 21af7240b..96a79a311 100644
--- a/workbooks/plan_management.yaml
+++ b/workbooks/plan_management.yaml
@@ -263,13 +263,30 @@ workflows:
 
       upload_templates_directory:
         action: tripleo.templates.upload container=<% $.container %> dir_to_upload=<% task(clone_git_repo).result %>
-        on-success: create_swift_rings_backup_plan
+        on-success: update_plan
         on-complete: cleanup_temporary_files
         on-error: upload_templates_directory_set_status_failed
 
       cleanup_temporary_files:
         action: tripleo.git.clean container=<% $.container %>
 
+      update_plan:
+        on-success:
+          - ensure_passwords_exist: <% $.generate_passwords = true %>
+          - container_images_prepare: <% $.generate_passwords != true %>
+
+      ensure_passwords_exist:
+        action: tripleo.parameters.generate_passwords container=<% $.container %>
+        on-success: container_images_prepare
+        on-error: ensure_passwords_exist_set_status_failed
+
+      container_images_prepare:
+        description: >
+          Populate all container image parameters with default values.
+        action: tripleo.container_images.prepare container=<% $.container %>
+        on-success: create_swift_rings_backup_plan
+        on-error: container_images_prepare_set_status_failed
+
       create_swift_rings_backup_plan:
         workflow: tripleo.swift_backup.v1.create_swift_backup_container_plan
         on-success: create_ceph_ansible_fetch_directory_backup_plan
@@ -298,7 +315,7 @@ workflows:
 
       does_ceph_ansible_fetch_directory_backup_need_rename:
         workflow: tripleo.rename_ceph_ansible_fetch_directory.v1.check_and_rename
-        on-success: update_plan
+        on-success: process_templates
         on-error: does_ceph_ansible_fetch_directory_backup_need_rename_set_status_failed
         input:
           container: <% $.container %>
@@ -306,23 +323,6 @@ workflows:
           container_suffix: "_ceph_ansible_fetch_dir"
           swift_tar: "temporary_dir.tar.gz"
 
-      update_plan:
-        on-success:
-          - ensure_passwords_exist: <% $.generate_passwords = true %>
-          - container_images_prepare: <% $.generate_passwords != true %>
-
-      ensure_passwords_exist:
-        action: tripleo.parameters.generate_passwords container=<% $.container %>
-        on-success: container_images_prepare
-        on-error: ensure_passwords_exist_set_status_failed
-
-      container_images_prepare:
-        description: >
-          Populate all container image parameters with default values.
-        action: tripleo.container_images.prepare container=<% $.container %>
-        on-success: process_templates
-        on-error: container_images_prepare_set_status_failed
-
       process_templates:
         action: tripleo.templates.process container=<% $.container %>
         on-success:
diff --git a/workbooks/rename_ceph_ansible_fetch_directory.yaml b/workbooks/rename_ceph_ansible_fetch_directory.yaml
index 13ed7ec17..063a820ad 100644
--- a/workbooks/rename_ceph_ansible_fetch_directory.yaml
+++ b/workbooks/rename_ceph_ansible_fetch_directory.yaml
@@ -63,7 +63,7 @@ workflows:
         on-success: notify_zaqar
         publish:
           status: SUCCESS
-          message: <% task(need_rename).result %>
+          message: <% switch($.need_rename = true => "The backup of the ceph-ansible fetch directory was renamed", $.need_rename != true => "The backup of the ceph-ansible fetch directory did not need to be renamed") %>
 
       verify_container_exists_set_status_failed:
         on-success: notify_zaqar