diff --git a/tasks/galera_cluster_state.yml b/tasks/galera_cluster_state.yml
index 884aea66..7f1bdf40 100644
--- a/tasks/galera_cluster_state.yml
+++ b/tasks/galera_cluster_state.yml
@@ -33,7 +33,7 @@
 
 - name: Gather mysql facts
   mysql_status_facts:
-  ignore_errors: true
+  failed_when: false
   tags:
     - galera-cluster-state-check
 
diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml
index abc83922..e06a718d 100644
--- a/tasks/galera_install_apt.yml
+++ b/tasks/galera_install_apt.yml
@@ -51,7 +51,7 @@
     state: "present"
   register: add_keys
   until: add_keys|success
-  ignore_errors: True
+  failed_when: false
   retries: 5
   delay: 2
   with_items: "{{ galera_gpg_keys }}"
diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml
index 91e64014..5d951778 100644
--- a/tasks/galera_install_yum.yml
+++ b/tasks/galera_install_yum.yml
@@ -34,7 +34,7 @@
     key: "{{ item.keyserver }}/{{ item.key_name }}"
   register: add_keys
   until: add_keys|success
-  ignore_errors: True
+  failed_when: false
   retries: 5
   delay: 2
   with_items: "{{ galera_client_gpg_keys }}"
diff --git a/tasks/galera_upgrade_check_apt.yml b/tasks/galera_upgrade_check_apt.yml
index 1e19e6ee..bcd3fff6 100644
--- a/tasks/galera_upgrade_check_apt.yml
+++ b/tasks/galera_upgrade_check_apt.yml
@@ -15,7 +15,7 @@
 
 - name: Check major galera install version
   command: "dpkg -s {{ galera_mariadb_apt_server_package }}"
-  ignore_errors: true
+  failed_when: false
   register: installed_galera_specific
   when:
     - not galera_upgrade | bool
@@ -28,7 +28,7 @@
 - name: Check for any galera install version
   shell: |
     dpkg --get-selections | grep mariadb-galera-server
-  ignore_errors: true
+  failed_when: false
   register: installed_galera_any
   when:
     - not galera_upgrade | bool
diff --git a/tasks/galera_upgrade_check_yum.yml b/tasks/galera_upgrade_check_yum.yml
index 10dc1ed8..32d54c3b 100644
--- a/tasks/galera_upgrade_check_yum.yml
+++ b/tasks/galera_upgrade_check_yum.yml
@@ -15,7 +15,7 @@
 
 - name: Check major galera install version
   command: "rpm -qi '{{ galera_mariadb_yum_server_package }}'"
-  ignore_errors: true
+  failed_when: false
   register: installed_galera_specific
   when:
     - not galera_upgrade | bool
@@ -28,7 +28,7 @@
 - name: Check for any galera install version
   shell: |
     rpm -qa | grep -i "{{ galera_mariadb_yum_server_package }}"
-  ignore_errors: true
+  failed_when: false
   register: installed_galera_any
   when:
     - not galera_upgrade | bool