diff --git a/defaults/main.yml b/defaults/main.yml
index 0bc6a3e8..dfb15035 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -107,6 +107,9 @@ upstream_container_images: true
 # tripleo-heat-templates directory
 tht_directory: "/usr/share/openstack-tripleo-heat-templates"
 
+# default roles_data.yaml
+default_roles_data: "{{ tht_directory }}/roles_data.yaml"
+
 # local registry environment file location
 containers_default_parameters: "{{ working_dir }}/docker-osp12.yaml"
 
diff --git a/tasks/common/auxilary-facts.yaml b/tasks/common/auxilary-facts.yaml
index 3694138e..585c33f7 100644
--- a/tasks/common/auxilary-facts.yaml
+++ b/tasks/common/auxilary-facts.yaml
@@ -15,7 +15,7 @@
 
 - name: set roles-data fact
   vars:
-    default_roles_data: "{{ tht_directory }}/roles_data.yaml"
     roles_data: "{{ roles_data_file.stdout }}"
   set_fact:
     roles_data: "{{ (roles_data_file.stdout|length > 0) | ternary(roles_data, default_roles_data)}}"
+    custom_roles_used: "{{ (roles_data_file.stdout|length > 0) | ternary(true, false)}}"
diff --git a/tasks/upgrade/adjust-roles-data.yaml b/tasks/upgrade/adjust-roles-data.yaml
new file mode 100644
index 00000000..994d9b24
--- /dev/null
+++ b/tasks/upgrade/adjust-roles-data.yaml
@@ -0,0 +1,14 @@
+---
+- name: rename FluentdClient to Fluentd
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1540546
+  replace:
+    path: "{{ roles_data }}"
+    regexp: '(\s+)- OS::TripleO::Services::FluentdClient$'
+    replace: '\1- OS::TripleO::Services::Fluentd'
+
+- name: remove ManilaBackendGeneric resource
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1541382
+  replace:
+    path: "{{ roles_data }}"
+    regexp: '(\s+)- OS::TripleO::Services::ManilaBackendGeneric$'
+    replace: ''
diff --git a/tasks/upgrade/overcloud_upgrade_prepare.yml b/tasks/upgrade/overcloud_upgrade_prepare.yml
index 1e75b6c4..6bf97bf4 100644
--- a/tasks/upgrade/overcloud_upgrade_prepare.yml
+++ b/tasks/upgrade/overcloud_upgrade_prepare.yml
@@ -1,4 +1,8 @@
 ---
+- name: adjust role-data for P->Q upgrade
+  include: adjust-roles-data.yaml
+  when: custom_roles_used|bool
+
 - name: add upgrade init script to upgrade prepare params
   set_fact:
     upgrade_prepare_extra_params: "{{ upgrade_prepare_extra_params + [upgrade_init_command_dest] }}"