diff --git a/tripleo_ansible/playbooks/cli-overcloud-backup.yaml b/tripleo_ansible/playbooks/cli-overcloud-backup.yaml
index 2ad4d4ab9..6ea1148b5 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-backup.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-backup.yaml
@@ -12,13 +12,20 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
+- become: true
+  hosts: ceph_mon
+  name: Backup ceph authentication
+  tasks:
+    - name: Backup ceph authentication role
+      include_role:
+        name: backup_and_restore
+        tasks_from: ceph_authentication
+      tags:
+        - bar_create_recover_image
 
 - name: TripleO Controller backup.
-  connection: "{{ (tripleo_target_host is defined) | ternary('ssh', 'local') }}"
   hosts: Controller
   remote_user: "{{ tripleo_target_user | default(lookup('env', 'USER')) }}"
   become: true
   roles:
     - role: backup_and_restore
-      tags:
-        - bar_create_recover_image
diff --git a/tripleo_ansible/playbooks/cli-undercloud-backup.yaml b/tripleo_ansible/playbooks/cli-undercloud-backup.yaml
index 406ca722a..5509b22d2 100644
--- a/tripleo_ansible/playbooks/cli-undercloud-backup.yaml
+++ b/tripleo_ansible/playbooks/cli-undercloud-backup.yaml
@@ -14,11 +14,8 @@
 #   under the License.
 
 - name: TripleO Undercloud backup.
-  connection: "{{ (tripleo_target_host is defined) | ternary('ssh', 'local') }}"
   hosts: Undercloud
   remote_user: "{{ tripleo_target_user | default(lookup('env', 'USER')) }}"
   become: true
   roles:
     - role: backup_and_restore
-      tags:
-        - bar_create_recover_image
diff --git a/tripleo_ansible/playbooks/prepare-nfs-backup.yaml b/tripleo_ansible/playbooks/prepare-nfs-backup.yaml
new file mode 100644
index 000000000..96601836a
--- /dev/null
+++ b/tripleo_ansible/playbooks/prepare-nfs-backup.yaml
@@ -0,0 +1,21 @@
+---
+#   Copyright 2020 Red Hat, Inc.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+
+- name: TripleO BackupNode NFS installation and configuration.
+  hosts: BackupNode
+  remote_user: "{{ tripleo_target_user | default(lookup('env', 'USER')) }}"
+  become: true
+  roles:
+    - role: backup_and_restore
diff --git a/tripleo_ansible/playbooks/prepare-overcloud-backup.yaml b/tripleo_ansible/playbooks/prepare-overcloud-backup.yaml
index 1434827c1..e768b8a1d 100644
--- a/tripleo_ansible/playbooks/prepare-overcloud-backup.yaml
+++ b/tripleo_ansible/playbooks/prepare-overcloud-backup.yaml
@@ -13,12 +13,9 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-- name: TripleO Controller backup system check.
-  connection: "{{ (tripleo_target_host is defined) | ternary('ssh', 'local') }}"
+- name: TripleO Controller ReaR installation and configuration.
   hosts: Controller
   remote_user: "{{ tripleo_target_user | default(lookup('env', 'USER')) }}"
   become: true
   roles:
     - role: backup_and_restore
-      tags:
-        - bar_setup_rear
diff --git a/tripleo_ansible/playbooks/prepare-undercloud-backup.yaml b/tripleo_ansible/playbooks/prepare-undercloud-backup.yaml
index 517ff789e..e30f5ee86 100644
--- a/tripleo_ansible/playbooks/prepare-undercloud-backup.yaml
+++ b/tripleo_ansible/playbooks/prepare-undercloud-backup.yaml
@@ -13,13 +13,9 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-- name: TripleO Undercloud backup system check.
-  connection: "{{ (tripleo_target_host is defined) | ternary('ssh', 'local') }}"
+- name: TripleO Undercloud ReaR installation and configuration.
   hosts: Undercloud
   remote_user: "{{ tripleo_target_user | default(lookup('env', 'USER')) }}"
   become: true
   roles:
     - role: backup_and_restore
-      tags:
-        - bar_setup_rear
-        - bar_setup_nfs_server