diff --git a/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml b/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
index 1df901ab62..f779e9765e 100644
--- a/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
+++ b/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
@@ -27,7 +27,7 @@
 
       - name: Retrieve differences
         shell: rsync -avun "{{ repo_root_dir }}/playbooks/inventory/env.d/" "/etc/openstack_deploy/env.d/" | grep "yml$"
-        ignore_errors: yes
+        failed_when: false
         register: diff_result
 
       - name: Copy new env.d files into place
diff --git a/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml b/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml
index e29d669817..7f5c731473 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml
@@ -23,7 +23,7 @@
     parted --script -l -m | egrep -q ':ext4:openstack-data[12]:;$'
   register: data_disk_partitions
   changed_when: false
-  ignore_errors: yes
+  failed_when: false
   tags:
     - check-data-disk-partitions