diff --git a/tasks/backup_mysql.yml b/tasks/backup_mysql.yml
index 53e1bf4..3bf32a9 100644
--- a/tasks/backup_mysql.yml
+++ b/tasks/backup_mysql.yml
@@ -22,11 +22,13 @@
   when: mysql_root_password is undefined
   register: mysql_root_password_cmd_output
   become: true
+  no_log: true
 
 - name: Convert the database root password if unknown
   set_fact:
     mysql_root_password: "{{ mysql_root_password_cmd_output.stdout_lines[0] }}"
   when: mysql_root_password is undefined
+  no_log: true
 
 # Originally used the script module for this but it had issues with
 # command piping. Using a script to perform the MySQL dumps.
diff --git a/tasks/restore_galera.yml b/tasks/restore_galera.yml
index a0e5aae..2afd812 100644
--- a/tasks/restore_galera.yml
+++ b/tasks/restore_galera.yml
@@ -22,11 +22,13 @@
   when: mysql_root_password is undefined
   register: mysql_root_password_cmd_output
   become: true
+  no_log: true
 
 - name: Convert the database root password variable if unknown
   set_fact:
     mysql_root_password: "{{ mysql_root_password_cmd_output.stdout_lines[0] }}"
   when: mysql_root_password is undefined
+  no_log: true
 
 - name: Get the database clustercheck password
   shell: |
@@ -34,11 +36,13 @@
   when: mysql_clustercheck_password is undefined
   register: mysql_clustercheck_password_cmd_output
   become: true
+  no_log: true
 
 - name: Convert the database clustercheck password variable if unknown
   set_fact:
     mysql_clustercheck_password: "{{ mysql_clustercheck_password_cmd_output.stdout_lines[0] }}"
   when: mysql_clustercheck_password is undefined
+  no_log: true
 
 - name: Remove any existing database backup directory
   file:
@@ -151,14 +155,16 @@
     host: "{{ mysql_bind_host.stdout|trim }}"
 
 - name: Import OpenStack MySQL data
-  shell: |
+  command: |
     /bin/mysql -u root -p{{ mysql_root_password }} < /var/tmp/openstack-backup/mysql/openstack-backup-mysql.sql
   when: bootstrap_node | bool
+  no_log: true
 
 - name: Import OpenStack MySQL grants data
-  shell: |
+  command: |
     /bin/mysql -u root -p{{ mysql_root_password }} < /var/tmp/openstack-backup/mysql/openstack-backup-mysql-grants.sql
   when: bootstrap_node | bool
+  no_log: true
 
 - name: Re-enable the database port externally
   iptables:
diff --git a/tasks/validate_galera.yml b/tasks/validate_galera.yml
index 1588f88..63f35b7 100644
--- a/tasks/validate_galera.yml
+++ b/tasks/validate_galera.yml
@@ -4,16 +4,19 @@
   when: mysql_clustercheck_password is undefined
   register: mysql_clustercheck_password_cmd_output
   become: true
+  no_log: true
 
 - name: Convert the database clustercheck password if unknown
   set_fact:
     mysql_clustercheck_password: "{{ mysql_clustercheck_password_cmd_output.stdout_lines[0] }}"
   when: mysql_clustercheck_password is undefined
+  no_log: true
 
 - name: Check the Galera cluster is Synced
-  script: |
+  command: |
     /bin/mysql -u clustercheck -p{{ mysql_clustercheck_password }} -nNE -e "SHOW STATUS LIKE 'wsrep_local_state';" | tail -1
   register: clustercheck_state
   until: clustercheck_state.stdout | trim | int == 4
   retries: 10
   delay: 5
+  no_log: true