diff --git a/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml b/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml
index f5126fb6d..239d56d2b 100644
--- a/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml
@@ -33,7 +33,7 @@
     - always
 
 - name: Take this node out of pacemaker
-  command: pcs node standby
+  command: pcs cluster stop --request-timeout={{ tripleo_backup_and_restore_pcs_timeout }}
   when:
     - pacemaker_enabled
     - tripleo_backup_and_restore_enable_snapshots|bool
diff --git a/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_unstandby.yml b/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml
similarity index 97%
rename from tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_unstandby.yml
rename to tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml
index 7162de7c8..14cc605ec 100644
--- a/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_unstandby.yml
+++ b/tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_start.yml
@@ -16,7 +16,7 @@
 #
 # Start again pacemaker
 - name: Add the node to the pacemaker cluster
-  command: pcs node unstandby
+  command: pcs cluster start
   tags:
     - bar_create_recover_image
 
diff --git a/tripleo_ansible/roles/backup-and-restore/defaults/main.yml b/tripleo_ansible/roles/backup-and-restore/defaults/main.yml
index 265ead8a2..c1b8fb5cb 100644
--- a/tripleo_ansible/roles/backup-and-restore/defaults/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/defaults/main.yml
@@ -81,3 +81,6 @@ tripleo_backup_and_restore_remove_default_cronjob: true
 
 # Skip the ping test to the NFS server on rear setup
 tripleo_backup_and_restore_skip_nfs_test: false
+
+# How many seconds do we want to wait fir pcs cluster stop to finish
+tripleo_backup_and_restore_pcs_timeout: 3600
diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/main.yml b/tripleo_ansible/roles/backup-and-restore/tasks/main.yml
index cf2404d25..f846d0d6f 100644
--- a/tripleo_ansible/roles/backup-and-restore/tasks/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/tasks/main.yml
@@ -62,7 +62,7 @@
         - not tripleo_backup_and_restore_enable_snapshots|bool
 
     - name: Pacemaker management
-      import_tasks: ../backup/tasks/pacemaker_unstandby.yml
+      import_tasks: ../backup/tasks/pacemaker_start.yml
       when:
         - pacemaker_enabled
         - tripleo_backup_and_restore_enable_snapshots|bool